Public Git Hosting - LibreOffice.git/log

cp#1000115 SwTxtFrm: don't join follow just because it has no content

The problem was that the bugdoc had a table, and inside the table there
was a long paragraph that flows to the next page, but only the paragraph
mark of it does so. We first split the frame to have space for the
paragraph mark, but later decided that all the content would fit the
first frame, and this way the last hard line break and the paragraph
mark was painted on each other.

This is normally not a problem without tables, because
SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to
non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to
join it, and we're ready. However, when the paragraph is inside a table,
then the paragraph was formatted multiple times, and next time when we
already had a follow nNew was not set, so even if there was a correct
split first, the new frame was joined later.

Fix the problem by explicitly setting nNew for the "in a table and
paragraph ends with a hard line break" case, that way we don't blindly
join the frame, only in case there is enough space for the follow in the
master.

(cherry picked from commit 7e33cce05b2df3f1761bcc66606c4d3b2b2671e9)

Conflicts:
sw/CppunitTest_sw_uiwriter.mk
sw/qa/extras/uiwriter/uiwriter.cxx

Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a

tdf#68117 Partially fix boolean labels in XLSX

Change-Id: I731a58c7749e157f6b40c60808687ce629683742
Reviewed-on: https://gerrit.libreoffice.org/14410
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Bump version to 4.2-24

Change-Id: I1acff9fe3e907b303851984674da33dff5ed0e08

fdo#67534 Fix "Property Handler" shared lock

As explained in the following link, access mode should be set to
"EnableShareDenyNone" to avoid blocking others process to access the
file opened by the Property Handler.
http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx

Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
scp2/source/winexplorerext/registryitem_winexplorerext.scp

Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3

Related: fdo#88455 crash using delete in available fields

Change-Id: I4ac5fe6f42b425ee96124b2dde39ff397a081638
(cherry picked from commit 1746c886362b8525b04365dd6b7203b8098b99ba)
Reviewed-on: https://gerrit.libreoffice.org/14290
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Resolves: rhbz#1179642 crash in GetFocus with empty mpPreviouslyFocusedListBox

Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76
(cherry picked from commit dae7d2089516d9cf014b9fad0adb484f19282a29)
Reviewed-on: https://gerrit.libreoffice.org/14161
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Resolves: fdo#75565 reduce block on pasting rtf like we do for html

Change-Id: I74a9748a2e4981dc5d1677f06db7eceed9e4b108
(cherry picked from commit 0efbd9931ea854cf71c4c54ca3f3d55d6db1fa13)
Reviewed-on: https://gerrit.libreoffice.org/14144
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit a0ef7698b7df63b8befe274305051063425f8eb6)

fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.

GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex."HGS Gothic M").
Because, the conversion table "aImplLocalizedNamesList[]" is wrong.

http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181

This causes the assertion from vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.

This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.

Change-Id: I3141bbbb7956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250)
Reviewed-on: https://gerrit.libreoffice.org/14262
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

Bump version to 4.2-23

Change-Id: Ica66c89fe86c18c436290a03849aa5ebfb4e8bc3

tdf#88051 fix Graphite layout at Linux Libertine G ligature followed by tab

Change-Id: Iecedb87f6329c1cddcaa4cd939b349924e58d256

Resolves: fdo#84943 make fodt non crashy like odt for formulas inside shapes

where odt checks for a null pTxtCrsr and skips the object and fodt
just ploughed ahead. i.e. make fodt equally useless as odt (fdo#84942)

(cherry picked from commit 4345a3de0e5a600685fef5dc9fa422fe6849a0a3)

Conflicts:
sw/source/filter/xml/xmltexti.cxx

Change-Id: I915cc1f7c065ea83377e895a932636c82698cf1f
Reviewed-on: https://gerrit.libreoffice.org/14058
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

Resolves: fdo#87601 specific html doc hangs on load

Change-Id: I67f472d72efe123b533d4d94be0084986c0e8349
(cherry picked from commit 6acd5c45c764d81aea1539e66adbfadb51df0aa3)
Reviewed-on: https://gerrit.libreoffice.org/14081
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

Resolves: fdo#88735 crash after calling sort after subtotal removal

Change-Id: Ia30271426ea47b7bf5af85d16591a02e6d52b3d9
(cherry picked from commit 0442cd217645aa4fdd924e4c2e4f90a77f1fbbad)
Reviewed-on: https://gerrit.libreoffice.org/14140
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

Resolves: tdf#81124 crash on setting autofilter on column with no content

Change-Id: Id53e589789144d892427a8a4ec1af1926aa97b52
(cherry picked from commit 3a5fa612b4afb72b5f91877a5c52e25c7604ae1a)
Reviewed-on: https://gerrit.libreoffice.org/14159
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Fix a single quote slipped in

See void SmNodeToTextVisitor::Visit( SmFontNode* pNode ) for comparison.

Change-Id: Id7e58fef3b715ef2a4bcb4e1a1d390aadf917b5f
Reviewed-on: https://gerrit.libreoffice.org/14193
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9efb04dfbf70e123da1755adcede8199eabf0d9a)
Reviewed-on: https://gerrit.libreoffice.org/14198

coverity#1266508 Useless call (gold)

regression from

commit 832e5aadbff006ec24959162c29756fe2b1982be
Author: Caolán McNamara <caolanm@redhat.com>
Date: Tue Oct 8 10:06:59 2013 +0100
Related: fdo#38838 remove UniString::SearchAndReplaceAll

(cherry picked from commit 6cde3ff3dd646f51f37f2342863371db8de9087a)

Conflicts:
sw/source/filter/html/wrthtml.cxx

Change-Id: If792925eddc9c640584a2e8fa313a4297a32c74c
Reviewed-on: https://gerrit.libreoffice.org/14172
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Resolves: fdo#87015 image missing from doc

regression from

commit e0cce521f1ad0cc384d30ce2f1077ea229fffe62
Author:     Armin Le Grand <alg@apache.org>
AuthorDate: Thu Jan 10 16:28:40 2013 +0000
Commit:     Caolán McNamara <caolanm@redhat.com>
CommitDate: Thu Jun 13 14:50:46 2013 +0100
    Resolves: #i121504# Support for alpha channel in clipboard for all systems
    (cherry picked from commit ef3931ff410117e1237b3bef7bc090e8b83b9519)

which blindly just bulldozed out the bMSOFormat branch

(cherry picked from commit 470fcca594ba4f6bf473d4d44b415c2ba151b0d9)

Conflicts:
vcl/source/gdi/dibtools.cxx

Change-Id: Iec354f1fb585f0803b9df472bc9ec9e103aa5847

Bump version to 4.2-22

Change-Id: Ib43b42caac84aa0218be5944b2b4f808860da9c0

avoid use of ref. to possibly deleted object

Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69
(cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c)
Reviewed-on: https://gerrit.libreoffice.org/11832
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

fdo#79269: fix ODF import of style:footer-first

The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.

This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c
because unostyle.cxx is very different on master...

Reviewed-on: https://gerrit.libreoffice.org/11722
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c)

Conflicts:
sw/source/core/unocore/unostyle.cxx

Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13
Reviewed-on: https://gerrit.libreoffice.org/11752
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#79249 call formula compiler with error string

... instead of attempting to stringize a NaN coded error value.

Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb

(cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6)

construct grouped ScFormulaCell with bDirty=true, fdo#79249 related

Noticed when loading
https://bugs.freedesktop.org/attachment.cgi?id=99844
with fdo#79249 fix where oox::xls::applyCellFormulas() groups the
consecutive =#N/A formulas. Only A1 result was displayed, other cells
were displayed empty.

(cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993)

correct error string, #N/A instead of #NA

(cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac)

implement an actually working setErrorCell() from BIFF error codes

(cherry picked from commit ca9a81b2ca858b82e863e1e6f917928916fea79e)

3a541f74d3d25e1515a1c6d47f02ec6a8e817c93
15019072b6e812b9ffe29d3ee6afacd9ab526948
67b8fc324779875ba14e2d69204c40fe27cc180e
Reviewed-on: https://gerrit.libreoffice.org/13492
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Conflicts:
sc/source/filter/oox/sheetdatabuffer.cxx

Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b

valgrind: uninitialized read

on loading id:000386,src:000000,op:havoc,rep:128.jpg as text

Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033
(cherry picked from commit 0b39d560da27ece227830a4bcc5556ae902a0921)
Reviewed-on: https://gerrit.libreoffice.org/13744
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

valgrind: initialize these

Change-Id: I6440832fe508689ffa8e20fa17827528331e3585
(cherry picked from commit 2645b1979365085edf4a94500f2c610bfc4e668b)

check size before looking into the string

Found by Asan. e.g moz233272-2.xpm

Change-Id: Ic563db41dbd4ce7250492e99f3e48a203cfdcf00
Reviewed-on: https://gerrit.libreoffice.org/13686
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ba4b5741db25ff3b76a8d10d8f3745dfc1973749)
(cherry picked from commit cda3b8767fd8f5b43b1043852e9f90fd17a129f4)

asan wrt mandriva57054-1.tiff

Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5
(cherry picked from commit f901624b5e13e300f8e2facd2a824202c21d9729)
Reviewed-on: https://gerrit.libreoffice.org/13739
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

reimplement shared formula import for xlsb, fdo#86734

(cherry picked from commit e1351ed4c5f9152c80b32bbaa53e3eff56671331)

Change-Id: Ic5d678a2b1197ce8d83b308b0a4387bf657052d5

use the correct tab for sheet local names, fdo#81195

Change-Id: I7e8b7ed552a37c6d9c6ce7c75765267b343d508c

relative refs wrap around in xls, fdo#84556

Change-Id: If84d468d4bd55ed55ccd517d0b078d283a1a9c38

handle relative refs correctly in xls import, fdo#80091

Change-Id: Ia70f96e1d31e71c56f03c828be0a4e49fff4b198

bnc#862510: PPTX import: Wrong text color inside shape

When theme index is 0, it means it's unset so we should not
apply that.

(cherry picked from commit 89206c472ecf18bfde6824cea8004921cd404365)

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: I62a9cd2a9b4c19f5acffc334d5e8263fe24fc8fd

fix OOXML validation errors

Change-Id: Ieac082a3b312602eff5ec101529536d747fa3836

resolved fdo#86809 connect filter conditions correctly

Maybe since 0960ec3e1b7b0d872d1f84d2d56f480a4df08b21 all conditions of a
single filter stack were OR connected, regardless whether filter-and was
given in the file.

Change-Id: Ifb423ccc7deb42bb6bba0bfc810607633f2c342c
(cherry picked from commit b500e60b32b5cf8fd61beb7476c2c29e65aee3e4)
Reviewed-on: https://gerrit.libreoffice.org/13450
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Bump version to 4.2-21

Change-Id: Id9a052e61b0c098ff9e843b04e738fc1daa3a7c7

fdo#68385 update references only if cut originates from the same document

Change-Id: Ia7b27309251cf9e47505c58d8ed0172d134280f4
(cherry picked from commit f2ac9fab2677a6a718f251baef75d3cae96d1f01)

resolved fdo#87237 propagate error values through matrix comparisons

Apparently introduced with 8e8b43a03e77dd251876c1de0ac06eeeb09192cd the
comparison results were stored as boolean values, effectively discarding
any infinite double values and error values encoded as NaN values.

(cherry picked from commit 3c405ff82fcc9f8f044833420485c54658064636)

Change-Id: I1fb6f46894a0bee02a37e28b7e6cc84f8c051f28

spell dialog: Make [Close] work in protected documents with editable fields.

We have to call ToggleChildWindow directly; calling SfxDispatcher's Execute()
does not work here when we are in a document with protected section - in that
case, the cursor can move from the editable field to the protected area, and
the slots get disabled because of SW_DISABLE_ON_PROTECTED_CURSOR (see
FN_SPELL_GRAMMAR_DIALOG in .sdi).

(cherry picked from commit 08e0a79aeba6fd41cbb51de3be48659619f27206)

Conflicts:
cui/source/dialogs/SpellDialog.cxx

Change-Id: I1c310c028aaaf774431d0b1e6bba10e901a8166d

no separator really means no separator, fdo#83027

Change-Id: I612a46701e7447db63f38ed709e8693d0533710d
Reviewed-on: https://gerrit.libreoffice.org/13474
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

PDF signing feature backported from 4.4

Cherry picked from:
840f75065918c4584fa9159fdc90242b5374ab37
1fe9ee73a758603ee0e1465931352c41ef8bd999
d8a8ff8177df628636d80c4dc1d8f597f6677dfc
bfa01d8a8248f7e44675de5ed1f85a1d17105022
bbb18f679f5a50e9c709520d6c3260d3d9db5aa9
c4cc31b5b55019aabad4045c8174b45e1b27073a
7e3c931786c3cbe83ee170b8b0746d141b520ce6
070c93af73df9aa4eb333265c81060d123b530b9
6e91763769a562b88882a4c2a94b1367c6ed4866

Change-Id: Ib4b67eec0fb7f032a395b5463b481a5680287768

fdo#37814: SHCreateItemFromParsingName doesn't like LO's file URLs

...but apparently wants pathnames instead, cf. the other use of it in
WinSalInstance::AddToRecentDocumentList (vcl/win/source/app/salinst.cxx).

Change-Id: Iaa64ff82915f7cbfee55b4389387b226f7adc919
(cherry picked from commit e123ffd66088783ce74a7b5f15e9d324b39ecf67)

PDF signing feature backported from 4.4

fdo#83939: Check return value from pPDFWriter->Emit()

Change-Id: Id492b1b6b9d534276c155b1e46953d098ce8b969

fdo#83939: Add new error code for failed PDF signing, and handle it

Conflicts:
filter/source/pdf/impdialog.hrc
filter/source/pdf/impdialog.src

Change-Id: Ide6dc06d33faea795272d9d32fc028ac8d023c5a

fdo#83939: Set error code if signing failed

Change-Id: I45f1077c744e20a369a73bf0b83c8dba04ddcda7

Use the "vcl.pdfwriter" logging tag instead of "vcl.gdi"

Change-Id: If53448ccfd0c156d4971ba994173b2d92af50138

We want PDF signing to be non-experimental now

Change-Id: Ic02d1f5169197edd8f9793befd45adf5db145a3b

Bin noise comments

Change-Id: I084040ff90ee30aa83ac5d3ad11365768272ec65

Bin noise comments and superfluous blank lines

Change-Id: Idec496b778d708fb6fa4c004329f8e734276052a

Remove noise SAL_WARNs that were not warnings, just informative messages

SAL_DEBUG is what should be used for stuff like that (and not committed).

Change-Id: I08505418bf9b55082e0d7672b85f3f76262dbad0

fdo#87030: PDF signing using Windows API, work in progress

Started writing a Windows version of PDFWriterImpl::finalizeSignature(). The
certificate we get from the selection dialog (in xmlsecurity) is from the
Windows built-in store anyway, so it is pointless to try to use it with
NSS. (See bug for longer discussion.)

So far it was pretty straightforward. The WinCrypt API seems clean and easy to
use. But for some reason the CryptSignHash() call fails with "Keyset does not
exist" (NTE_BAD_KEYSET). What am I missing?

Anyway, comitting this now as it does compile and doesn't make things worse.

Change-Id: I0941995ad6e22c5487c6e6fe0084d3df0b2341c7

fdo#87030: Prevent PDF signing using Windows API from failing

There was one details that I had missed in my initial coding:
CryptAcquireContext() doesn't give you a HCRYPTPROV key container that
would contain the private key of a public key certificate. For that
you need to use CryptAcquireCertificatePrivateKey(). When the hash has
been created using such a HCRYPTPROV, the CryptSignHash() call
succeeds.

The certificate in DER encoding that is passed in from the caller,
obtained in the certificate chooser (in xmlsecurity), is possibly not
good enough to be used for the other things. So look the same (?)
certificate up in the user's key store instead. At least more
properties are present in the certificate when looked up like that.

Add more SAL_INFO logging, with cleartext dumping of certificate
context property names and list of algorithms supported by the CSP.

Unfortunately, even if all the WinCrypt API calls now succeed, the
signatures we produce still are not good enough for Adobe Reader... A
lot of information must be missing, they are quite short, just 256
bytes.

Change-Id: Ifa4dd37b6d40932fcdcbb07e00c9eb52d54a5477

fdo#87030: Generate a proper PKCS#7 signature

The signature should be in DER-encoded PKCS#7 format and what CryptSignHash()
produces is nothing like that. Luckily CryptSignMessage() is actually almost
easier to use and is capable of doing what we need. This also means that we
won't need any HCRYPTPROV or HCRYPTHASH after all so all the code related to
that can be removed. CryptSignMessage() handles both calculating the hash and
signing it.

One less than ideal issue with CryptSignMessage() is that it needs all the
data to be hashed and signed at the same time, so we need to keep both buffers
around for signing.

It also turns out that we don't need to look up the certificate anew from the
user's certificate store after all.

Now Adobe Reader doesn't complain any longer about the signature's format and
contents.

Change-Id: I25cfb93b516ffa723c6228d068d9ffa8e7cc4790

do not save UNO marks in undo history

These are usually very short-lived marks that are used for various
internal purposes or by UNO interfaces, so restoring them from undo history
does not make any sense. It can in fact lead to a crash on undo if the mark has
been already deleted (which is usually the case with UNO marks) but
the restoring still refers to it (this is not a problem with other mark types
since those should be deleted only when they are no longer in the document,
in which case they are saved in undo history by content positions rather than
mark references).

Change-Id: Id707dc3d2b888b5c96a974d04a0ef17b22fc024c

don't update range name if ref not in update range, fdo#85304

Change-Id: I1ccfacd98bd10f6ae1d4eaf7a705fe8863045697

we need the SdrPage for deleting the notes, fdo#86166

The SdrPage that contains the shapes for the note captions is deleted
before the notes. Prevent that case by deleting the notes before
deleting the SdrPage.

Change-Id: I13727cea7df0b033fb386a6a8e20dcadec743335

correct order of xml elements, related fdo#45266

Change-Id: I03ea0e5bb064222e50dc08a682091ec3e23bf11d

remove invalid attribute that is not read anyway

Change-Id: Id7770ffda49ba7bc0ebc780c67c56b81152213f7

the xlink:type attribute is mandatory, related fdo#79449

Change-Id: I03c4217f786bc10aa915780dc10ea52d94019b6e

fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...

... if it has start/end, because Writer will become grumpy and crash.

(cherry picked from commit 25fd11e78279aef5a6b7656347758e5c67a9c45a)

Conflicts:
xmloff/source/text/XMLTextMarkImportContext.cxx

Change-Id: I6024051249eeac6ed9e43856fa77db969287f888

fdo#58112 write loext:contextual-spacing accept style:contextual-spacing

Change-Id: I3e6698d9d9399dd5a13658641847df8a5f34f6ae

Revert "ODF export: don't write invalid "group-name" attribute"

This reverts commit 53824b05f99ac7c68e6d48b53e2bd98c0fe274c7.

Bump version to 4.2-20

Change-Id: I9838eede17e52ba377f072f967acf65f081d1985

fdo#86762 re-establish listeners to move cell broadcasters

... for UpdateReferenceOnSort=false

(cherry picked from commit 6c2111f17089eb667bf526561d7667d17825e822)

Conflicts:
sc/source/core/data/table3.cxx

fdo#86762 broadcast also empty cells after sort

(cherry picked from commit 08793e08c7e9cefe594c49130f782725e386c463)

Conflicts:
sc/inc/column.hxx
sc/source/core/data/column.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table2.cxx
sc/source/ui/docshell/dbdocfun.cxx

fdo#86762 re-establish listeners on moved broadcasters

... also in SortReorderByColumn() similar to SortReorderByRow()

(cherry picked from commit e119f3883513aeaa49f332362620e955dc8b453f)

Conflicts:
sc/source/core/data/table3.cxx

e275a754c530d6039ed14304900dd71416f36e46
7665dcc90d70fcf3b08bef0adb9ab6aaff1cdcdf

Change-Id: Id90288660e317d6e47ee01ee3b5ff9058cfa18df
Reviewed-on: https://gerrit.libreoffice.org/13275
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

editeng: fix build

Change-Id: I64d50f1b1554f7bbb1aadffd16089be2847b765a
(cherry picked from commit d6edd18c7bda9ca6325b1abd59de0014be33a0bb)

mirror fixes for fdo#78906 and deb#766788 into icu

(cherry picked from commit a66451887425ddd9387e2b25d5125916f4a35f83)
(cherry picked from commit bff0fe902686d8c126a73e1d2c914f5d65c6ffaf)

Conflicts:
external/icu/UnpackedTarball_icu.mk

Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9
Reviewed-on: https://gerrit.libreoffice.org/13220
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Prevent occasional crash

I came across the crash by accident when checking how it works to have
multiple windows showing the same document. Pasting in lots of text
and then quickly telling LO to exit with Cmd-Q caused a crash here as
GetPostItMgr() returned NULL.

Change-Id: Ib9e636df0832a679a1d81fa3856ea0a7105a69c3
(cherry picked from commit 0eb1ef39084a978e8c2bec977ebabf6708f0c073)
Reviewed-on: https://gerrit.libreoffice.org/13219
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

prevent invalid ods files with loext:fill-character

ODF specifies that extension elements in a document are removed before
the validation. With our old implementation of the number format export
this could result in two number:text elements following each other.

According to the spec a number:text element may not follow another
number:text element.

The number:text element before loext:fill is actually not that
interesting so it makes more sense to make this one an extension
element.

Possible documents showing issues:

fdo45268-1.xlsx
fdo49150-1.xlsx
and many more

Conflicts:
xmloff/source/style/xmlnumfe.cxx

Change-Id: I3ad92b8a61a246b3dbc0132d9a2c367488a766d0

ODF export: don't write invalid "group-name" attribute

Radio buttons are grouped via their "form:name" attribute already.

Change-Id: I9f8b27a2904d947c3d4665495d36961e3e41d2c6

fdo#85496: editeng: avoid exporting duplicate attributes

Since commit 0d57434180db6c8eda8c5b9b704f8a1c18b371df multiple 0-length
attributes will be exported by the ODF filter as duplicate attributes.

(cherry picked from commit 7a242b463132d67a4a2d6e69319e0da367145cc0)
(cherry picked from commit 846b56b6b99e334dfa44f1a24640aa3158509854)

This backport takes a different approach from the master fix and simply
detects duplicates in EditTextObjectImpl::GetAllSections() which should
be safe enough for 4.2.8.2.

Change-Id: Iff787c8d2a71bc3082192cc98e3d916badee65dd

PPTX import: fix import of shape line properties defined by theme

See also:
81cd386facedfbb15be6dffc10351262abf733f3

(cherry picked from commit 664a56b3c81503bdf199edf1806676f0a35b956f)

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: Ibb21d3e5b52a4d4996202acd4a989910fa223632

bnc#904423: Text(box) is rendered white on white when it is not

The problem was that the background color defined by theme
was not imported correctly, because the different fill
style comes from different sources (master slide, theme,
direct formatting) were applied on the shape in wrong order.

To solve this we need to store master slide defined fill style
in a different variable so theme style can be applied after master
slide defined style but before direct formatting.

(cherry picked from commit 81cd386facedfbb15be6dffc10351262abf733f3)

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: I99ea981858b9fa391915570187c8ddfdf2be1f7a

set only valid positions from ScExtTabSettings at ScViewDataTable

Some address fields of ScExtTabSettings are initialized invalid and
maybe kept invalid, on purpose, so take care of that and use only the
valid fields.

Change-Id: I37cbf8ff49c6ccf38bfac3e1c8c6492ac7bad61b
(cherry picked from commit 8bc56801af0540c0496c1f8ddd335578a8791017)
Reviewed-on: https://gerrit.libreoffice.org/13184
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

update credits

Change-Id: I80b2c7ae8e17075219b6827590d3268ad2989478

test rows for validity

Change-Id: I501c1c18df96b5b2ad628e86cfb724a541d5c4b6
(cherry picked from commit 1e514c8da8e37fc3cb26af6ddaf95a3ed8093a41)
Reviewed-on: https://gerrit.libreoffice.org/13171
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

Related: #i17171# identify places where -1 was cast to 0xFFFF in the past

try and do so anyway. Could be picking that sort of lint out of writer
for a while to come :-(

(cherry picked from commit 16c565461b40c6876e69dc7bcc18f7c4db7fb94d)

Note: this fixes fdo#80571

Note: for backport, removed any changes where the variables are still
xub_StrLen; only sal_Int32 variables may have values < 0.

Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
sw/source/core/crsr/swcrsr.cxx
sw/source/core/text/porfld.cxx
sw/source/core/text/txthyph.cxx
sw/source/core/txtnode/fntcap.cxx
sw/source/core/txtnode/txtedt.cxx

Change-Id: I4efb94e5ed33025f7f416c096af25ba358ef45af

Resolves: fdo#84043 don't create duplicate Mirrored[X|Y] properties

regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09

commit 13ef16423e78d3ea825172594f08c47d2f9bfd09
Author: Armin Le Grand <alg@apache.org>
Date:   Wed Nov 21 13:23:01 2012 +0000

    For backward compatibility take mirrorings in setTransformation into account

    Also found an error in SdrObjCustomShape::TRGetBaseGeometry when MirrorY was used

    (cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507)

Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb
(cherry picked from commit 751e5b32c5c361995bf0ba3295f773341fd92c23)
Reviewed-on: https://gerrit.libreoffice.org/13149
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit d3b7bf16a58c02af2d1fdf5db2fa149c6815095c)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

Resolves: fdo#86449 CVE-2014-9093 backport rtf fixes

The actual bug is against 3.5.4 and 4.2 doesn't crash in anything like the same
way but it does still crash. So these fixes stop the provided examples from
crashing in 4.2 on using top on an empty stack, which isn't the same as
actually being a fix for CVE-2014-9093 as seen in 3.5.X

empty Reference

valgrind + bff

(cherry picked from commit 0a42632a74596cbc781746931bf8f2650994b80f)

empty m_aStates

valgrind + bff

(cherry picked from commit e3247719911f4e9b61ec43ea1c9ce04bcddc4ff8)

3bd526b7ebf0f4fce5d0c7054809e0dc2908e73f
Reviewed-on: https://gerrit.libreoffice.org/12965
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit b4840d3632e4404bee4bd192a7db916cbad3a401)

Conflicts:
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx

Resolves: fdo#86451 guard all the tops post pop

Reviewed-on: https://gerrit.libreoffice.org/12966
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 566300ebd57e6ff07fdb014321e23a92c9bcf5ee)

Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx

98be6f014893dfc7cee770c44cd9d0be32b39f5c

Change-Id: Id3c039a46dec5d2d4a4642dfb53d23a76972dde2

update credits

Change-Id: I100c4f5a44b89955ef169339a3613ccc85c038fb

Updated core
Project: translations 4c97a576edaa75a013dbbfdc472324131e961298

Resolves: rhbz#1165444 abrt crash with NULL pView

Change-Id: I37f02f16209f274cf0358defba6bfa109948990f
(cherry picked from commit 755209d88073fd497b884b8de1348ec75c2df7eb)

fdo#70861: cui: fix crash in SvxExtParagraphTabPage

SvxExtParagraphTabPage::Reset() must not request a pool default for
SID_ATTR_PARA_PAGENUM because it simply does not exist; the item is
backed by a member of SwPageDesc in Writer.

(cherry picked from commit 9c1a1b98776ca2216d82af303394a09f2bac0471)

Conflicts:
cui/source/tabpages/paragrph.cxx

Change-Id: I9b157f048cd986566f9b01f3677b53d5974b6c8d

Revert "fdo#70861 SwToSfxPageDescAttr: fix call to SvxExtParagraphTabPage"

This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4.

Resolves: fdo#75408 go back to the old way of doing things

Revert "Resolves: rhbz#1012353 fdo#48846 allow starmath objects to be resized"

This reverts commit 1b717e5686f34c3ce798310a6216f7ea98fb2cd9.

Change-Id: Iaf8410fc1e5611cda04356d32e37ee25a7f59898
(cherry picked from commit 51221bbf0c7cca0a329393dac2059818006ab338)
(cherry picked from commit 2babe1baf46dcad936703d12cbd847393f5e467b)

fix fdo#79441 again and keep references to other sheets during sort

... also if other references are not updated. References to other sheets
are never to be treated as relative during sort, they are always
absolute, even if they have relative row/column part references.

Broken again during the big sort mess. Even if there was a unit test,
which didn't help as it got disabled / adapted to the change..

(cherry picked from commit f0e7364603c9566bc158303c515c3274ccba62ca)

Backported.

Change-Id: Ic0e61c5e1cb0728e20725c29e450ab0eb55c3305
Reviewed-on: https://gerrit.libreoffice.org/13118
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

fdo#86708 paint after Undo of Sort

Regression of 10fc138307afb4b39baddb0d56eb8e986e5d29ea that exchanged
the PostPaint with SetDirty, but the paint is also needed.

Change-Id: Ic3e81fa106f405568effaed71ab33b575b4c5c5c
(cherry picked from commit 5cec4ea827570a5bb0a368025f3733b841107d07)

fdo#61167 suggest titlecase and uppercase words from exception dict

Change-Id: I280ffed996814e246ac3e93de5ff0acaad84018c

fdo#76658 fix bad conversion of old-style UNO service..

in my commit 0394cb37a2d378511f265004b285fd93df37e5ca
"fdo#46808, Convert ui::ImageManager to new style"

Change-Id: I77d3189723403221e7388969b1eb892a244b90af
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 00ddedcb477ed09b5649e816b629234d5689b861)
Reviewed-on: https://gerrit.libreoffice.org/13069
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>

added Lithuanian "LTL" to EUROCONVERT(), CONVERT()

Change-Id: Iefde129177df827c4b6508ff190f20e1e1973221
Reviewed-on: https://gerrit.libreoffice.org/11088
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
(cherry picked from commit 21c8b5815a21b6586fe13b12d00a9fb432c2aef4)
Reviewed-on: https://gerrit.libreoffice.org/12463
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

added EUR as default currency to Lithuanian locale

Change-Id: I08c82639da2acd5830fa69044b252217b69c5e62
Reviewed-on: https://gerrit.libreoffice.org/11089
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
(cherry picked from commit a150d06bc5cda4f18364256af859fd3e1ee70b4b)
Signed-off-by: Andras Timar <andras.timar@collabora.com>

fdo#86573: Impress does not show pictures anymore

Regression from:
286e2f5c6ec829bc0987b1be7016699f7ef03e5e

Sometimes SdrGrafObj import the image file just as a
preview (with low resolution) and late when the real
picture is needed it just throws this preview and tries
to load the image again.
This preview works only with package URL so in this
case we should not forget that URL.

Plus an other related potential image loss situation:
- Image preview is thrown when we actually have no
package URL from we can import the image again.

(cherry picked from commit f0b28806eebb1477066d44de49b5d1d61a8e84cf)

Change-Id: Ib21f400eb6d28133e8598e6b201209e5dd1a976f

fdo#77971 Writer:Better font selection in Japanese locale on Mac OSX.

This patch resolves the problem that Basic fonts(Asian) are Arial
Unicode MS in Japanese locale on Mac OSX.
Expected behavior is that Basic fonts(Asian) are Hiragino Mincho ProN
font.

LibreOffice 4.1 and later, on Mac OS X, the font family names are kept
without suffix(e.g. w3, w6) in the system font list.
Some font names in VCL.xcu (font family name including the weight
as suffix) doesn't match the font name kept in the system font list.

This problem reproduces at the CJK fonts environment.
This patch resolves this problem with Japanese fonts environment only.

Change-Id: Iaf3eb2225fbc6375d1911976ac40a4d8f2fa0590
Reviewed-on: https://gerrit.libreoffice.org/12455
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

busted loop condition and coverity#1255390 Resource leak

regression from

commit 119873328acd70ca3569c21a0b1fe36277e8bf4c
Date: Thu Oct 21 15:34:02 2010 -0500
convert vos/process.hxx and related API

Change-Id: I36527a4f0109105b9853a79773b4c92f9bc4e902
(cherry picked from commit ecc56da366960b642d0a7da1b4a47245243252f8)

Resolves: fdo#86466 Wrong background color shown in format table in impress

regression from

commit 440e2031ce8cffc8dc573e359a330236f9c11dfb
    bnc#882627: Allow to edit spacing to contents even with no borders visible.

which was an attempt to fix regression from

commit 9e5342509b302ba1f816f21cc3ad1cb7093982e0
Date:   Mon Jun 3 14:22:07 2013 +0200

    copy values from the original item set

    ... because SfxAbstractDialog::GetOutputItemSet() only contains the
    items that have been _changed_ in the dialog.

Now format color shows the expected color, and loading the sample for
bnc#882627 and selecting cells and changing the border distance (etc) doesn't
cause bulleting and paragraph alignment properties to be stripped away

(cherry picked from commit e91ab2104b62b689dca2c565cd81a8cb40885822)

Conflicts:
svx/source/table/tablecontroller.cxx

Conflicts:
svx/source/table/tablecontroller.cxx

Change-Id: Id414e09faa221d151f393971654b17bbe9f46d81

Resolves: fdo#86392 the assert seems to just want the attrs to be sorted

i.e. two at the same position is ok

assert added in

commit 8220b70fe2dc270188751950ac6d872320db1aa2
Date: Sun Jul 27 00:21:50 2014 -0400
bnc#467459 - fix editeng text search with expanded fields.

Change-Id: Ifc65f3301a7d505a7d2d13e5914f53cbe263fc1f
(cherry picked from commit e37e8f38d1f5c6bc427965dc535f1a64f0c8649c)

fdo#83765 do not update references in SortReorderByColumn() if disabled

Similar to SortReorderByRow()

(cherry picked from commit 115a4b7ca36f65d93070d2e81048320d202e87a3)

Conflicts:
sc/inc/column.hxx

Change-Id: I11dd710c00a56a5f56aeb048fa2258631555a220

Related fdo#82953: Forget package URL of image after it is loaded

It causes problems if we handle those imported images differently which
are identified by a package URL, so after the first load remove
this URL and handle images on the same way as inserted images.

Some related bugs:
* #i44367#
* #i124946#
* #i114361#
* fdo#73270

The image in the test document has a special ID which is different
from that one which is generated by LO internally so after ODF export
the new generated image URL is different from the imported one.

(cherry picked from commit 286e2f5c6ec829bc0987b1be7016699f7ef03e5e)

Change-Id: I4e7d3490674c5f86bec5c7c6e1c975dcafd7c265

buildfix: sw ww8 export unit test

Change-Id: I011bea4f6da37e180446447dee1b79eee7bbd918

Bump version to 4.2-19

Change-Id: Ie02193db64ea94de1f1df6a2e2aa6d13ddbd72e2

fix bnc#624546 (fdo#83773) slide pane cut/copy/paste in outline view

Problem:
When I'm in outline mode, if I select a slide in the left slide preview
pane, ctrl-c, then select another slide I would like it after and hit
ctrl-v; it refuses to cut/paste.

Analysis:
This issue is due to the fact that the outline view always grabs focus
when activated and a view is activated whenever is pushed to the
sfx shell stack even if it is not the new top-most active view shell
(see `ViewShellManager`, `SfxViewShell`, `SfxDispacther`).

Solution:
Make the `OutlineViewShell` grabs focus only if it is the top-most
active view shell.

Rationale:
When `OutlineViewShell::Activate` is invoked, instead of removing
the focus grabbing action completely, we check if the
`OutlineViewShell` instance is the the top-most view shell and
perform the focus grabbing action only in such a case. This change
required to have also the `DrawViewShell` grabbing focus on
activation (only when it is the top-most view shell). In order to
implement this solution I needed to add a new method (and data
member) to the `ViewShellManager` class. I named it
`GetTopViewShell`. This method returns a pointer to the top-most
active view shell of the internal stack. The returned pointer is
updated in the `UpdateShellStack` method, before the sfx shell
stack is updated.

For more details see :
https://gist.github.com/mcecchetti/15b3ebc505d6582ea0db

(cherry picked from commit 967a386bccb15b99915a1e878e42450fbe9a2d0e)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sd/source/ui/view/ViewShellManager.cxx

Change-Id: I619a406864f50f0e62dee3fcb9ac5d46e3d48272