Public Git Hosting - LibreOffice.git/log

RTF import: fix spurious page breaks at doc end (related: rhbz#1065629)

When a document ends with \sect it's possible that a spurious page break
is created. In fact the spurious page break is always created by the
RTF importer, sometimes it is deleted again by
DomainMapper_Impl::RemoveLastParagraph() and sometimes not.

It is created because on the final \sect RTFDocumentImpl::sectBreak()
still calls startSectionGroup(), and the popState() for the \rtf1 group
then calls sectBreak() another time.

To prevent this, do not call startSectionGroup() from sectBreak() but
instead from setNeedSect(), and ensure that it is called as soon as
anything after \sect is read.

One unit test fails because the \page is not handled properly: the
conversion to \skbpage \sect \skbnone is not correct, because the \skb*
keywords are an exception and affect the \sect that precedes them, not
the following one; sending the \skbpage later unfortunately requires
additional cleanup later.

(cherry picked from commit e3f254ab8211fbab7541cde2100a35c875b0c240)

RTF import: add unit test for page break in continuous section

(cherry picked from commit f03218f43e8c25c2e136d364455f3cdaf95362b6)

RTF import: fix paragraphs in header/footer

(cherry picked from commit 74b3f4f00766d199df3b017d056cf7a00ae52988)

Change-Id: I3c1a3bceb2c8b75bbecdc748170562451ce5f5c3
Reviewed-on: https://gerrit.libreoffice.org/8439
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fdo#75053: Adjust reference update on shift for formula groups.

This is similar to my earlier fix for reference update on moving of
cells.

Change-Id: I592599507bfcab12f611eeae7b56c99da6c31919
(cherry picked from commit f32df2d590d0ee14f09664934457ba9e8de8cbe6)
Reviewed-on: https://gerrit.libreoffice.org/8403
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

cppcheck: duplicateIf

- replace duplicate TIB_DROPDOWN test with TIB_DROPDOWN + TIB_DROPDOWNONLY
- consider also TIB_RADIOCHECK as AccessibleRole::TOGGLE_BUTTON

Change-Id: Id159349ae1515681f47c373ba3d839ed406284ab
Reviewed-on: https://gerrit.libreoffice.org/8164
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/8371
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

Resolves: rhbz#1007697 Update on a Window triggering delete on window

Reviewed-on: https://gerrit.libreoffice.org/8396
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 1ec2880679d88c89901ce00fe30dd78e584f6960)

Conflicts:
svx/source/svdraw/sdrpaintwindow.cxx
vcl/source/window/window.cxx

Change-Id: Ic6374ce45e3a3ba97217ae77e91f9143f46e277b
Reviewed-on: https://gerrit.libreoffice.org/8398
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fdo#52547 SOT: Prefer embedding image data to embedding linked image.

When copying an image from e.g. Firefox or Chromium the clipboard
will contain both the image itself, and the url of the image --
presumably it makes more sense to store the image data itself if
it is available -- the order of the items in the *_FREE_AREA_Copy
defines the order of preference for which data in the clipboard
should be used.

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

Resolves: fdo#73851 promote labels to headings

Change-Id: Ia12b32abfad987bfaecc54005a73ccbeb158f61b
(cherry picked from commit c923b15cd99672e5b93d1ab6314c66caa417c738)

Related: fdo#73851 select driver list widget to shrink/expand

Change-Id: I3f2013ab8e0b188e74da99d2f1ff8bc842f60f50
(cherry picked from commit c8cd1c61ee3f491e170086f740ffde65a8a63f83)
Reviewed-on: https://gerrit.libreoffice.org/8397
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

fdo#75582: Handle MalformedUriException

Cherry-picks from master 29c3bb0968cb9770f7b822f5cf466314be9db825 "Handle
vnd.sun.star.Package: URLs provoking MalrformedUriException,"
eaa876e48695e7927563ee56a08e11acb0036e4a "typo in comment," and
33ca98314133a93e71edb1a003fe8ddb7b36e8a9 "Catching MalformedUriException
subsumes the rPath.isEmpty() case now," which are based on master-only
87432aeecdfa7194bb5050f912656e03294cf6c7 "Resolves: #i123042# corrected reload
of linked content..." but which is not needed to fix this issue.

Conflicts:
svgio/source/svgreader/svgimagenode.cxx

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

fdo#75304: Set external reference info to ScCompiler.

And remove this excessive const fetish which was unfortunately necessary to
get this to compile. Setting the container const is good enough.

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

fdo#75540 setProcessServiceFactory must be called before InitVCL

...because InitVCL now calls:

> comphelper::getProcessServiceFactory
> comphelper::getProcessComponentContext
> utl::DefaultFontConfiguration::DefaultFontConfiguration
> rtl::Static<utl::DefaultFontConfiguration, (anonymous namespace)::theDefaultFontConfiguration>::get
> utl::DefaultFontConfiguration::get
> ImplStyleData::SetStandardStyles
> ImplStyleData::ImplStyleData
> boost::make_shared<ImplStyleData>
> StyleSettings::StyleSettings
> ImplAllSettingsData::ImplAllSettingsData
> boost::make_shared<ImplAllSettingsData>
> AllSettings::AllSettings
> Application::InitSettings
> Application::GetSettings
> GtkInstance::AfterAppInit
> InitVCL
> ImplSVMain
> SVMain
> sal_main
> main

and Application::Main is only called after InitVCL.

(cherry picked from commit c828e3cc409077a1916911b8abf1d7b8dbb2078a)
Conflicts:
padmin/source/pamain.cxx

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

fdo#73159 Make border dialog work again

I removed border dialog with commit
8560fb88c7252e5ad60674e447f2e194298f08de
because it seems unused and when the corresponding
command was called only a blank window was opened.
It seems it was just bugous, so revert this commit
and fix the dialog.

Conflicts:
sw/inc/swabstdlg.hxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx

(cherry picked from commit f73ffb91b85422067274fafc0d411aef8a6e6abb)

Change-Id: I68f8c13457e899a894f03bdd60ebedfb2b70afea
Reviewed-on: https://gerrit.libreoffice.org/8375
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fdo#75259: Let undo document share its string pool with the source doc.

We already do that for the pool helper. It would only make sense to do
it for shared strings as well.

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

fdo#75526: sdk: install URE library symlinks / import libs again

This is a bit involved because since the LinkTarget now creates the
instdir/sdk/lib/* files itself a Package cannot be used; so convert the
URE libraries to AutoInstall and add special handling for them to
gb_Helper_register_libraries_for_install to create the necessary links
in the "sdk" install-module.

(regression from 70c35265f517ef372cb739d4cc64499abf57a838)

(cherry picked from commit 482ab0d09620f92eb3618125930dc7c4c8335b5e)

Conflicts:
solenv/gbuild/AutoInstall.mk

fdo#75526: argh missing semicolon
(cherry picked from commit 7eeac88bdb111cc069d208cc2d82a6143748d9d3)

Change-Id: Ia5467f3303d59f7f5f4a88adc22ceffb82a21ff1
Reviewed-on: https://gerrit.libreoffice.org/8365
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>

fdo#64957: #i124233# prevent the accumulation of rounding errors

in CTLayout::FillDXArry()

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

fdo#75386: Totally fix reference update during range move.

It was just not working at all due to multiple reasons. The
reference update needed to be reworked for formula groups such that
the token array is adjusted only for the top cell but all formula cells
still needed to be processed afterwards. The bound check also needed
to be done against the old range prior to the move, not the new range
after the move.

During undo, the paint had to be deferred until after the two calls to
DoUndo() else the formula cells would get re-calculated before the
values were placed back to their old positions, causing them to mis-
calculate wrong values.

Change-Id: Iba66f80a413e0539cac5ab619226cd6f7a04f317
(cherry picked from commit 79d03eb090a5f88863c1004ef8b7f483cbecb69d)
Reviewed-on: https://gerrit.libreoffice.org/8352
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

fdo#74573: Delete ranges that are non-empty before pasting from clipboard.

The conditional formatting part is still not working. But other bits
appear to be working now.

Also, adjust handling of mix document aka paste functions with this
change. When using paste function (add, subtract, etc), the behavior
between the 'skip empty' flag on and off makes no difference. Let's
set the flag to off when paste function is used.

(cherry picked from commit 0c12aa670b83b76241077dfb8bc21f40a55b1667)
(cherry picked from commit 2f55cee39379a76920f3a4fb14e6c2774093bfcd)
(cherry picked from commit cdc8ebf9646e773351c91039a62f2414c7b02105)

Conflicts:
sc/inc/clipcontext.hxx
sc/inc/column.hxx
sc/inc/document.hxx
sc/inc/table.hxx
sc/source/core/data/clipcontext.cxx
sc/source/core/data/column4.cxx
sc/source/core/data/document10.cxx
sc/source/core/data/table7.cxx

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

fdo#72041: Intern strings as we populate the external cache.

This commit covers ods import and UNO API layer.

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

ambiguity

Change-Id: Id0e3a969ff282673efd874980c25570b7ea1087b
(cherry picked from commit 9d6c36dee3c7bd60f86c286d2fb5e3a00da86c84)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

writerfilter: attempt to appease Mac tinderboxes

Change-Id: I014f71642f275716c8ebe7a471bf211c342145fb
(cherry picked from commit f7e1e0243318743f18b6cc6a87b7307e357f953f)

Related: #i124106# correct handling of page break attributes

i.e. those which are providing the default value explicitly

(cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/PropertyMap.cxx

(cherry picked from commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx

Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c
Signed-off-by: Miklos Vajna <vmiklos@collabora.co.uk>

RTFSdrImport::resolveDhgt(): fix crashing C-cast

Inside DomainMapper::graphicZOrderHelper() this is offset by 0x40 so
whatever that cast does, it's doing it wrong.

Change-Id: Ie48467c12828137a521cba47c2e04cac65201d1d
(cherry picked from commit 8dcb56fdcea455012ef010c343ab036955678f4d)
Reviewed-on: https://gerrit.libreoffice.org/8222
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

rhbz#1065629: RTF import: re-implement nested tables

The previous fix for this bug only fixed a symptom, this a fix for the
real problem; with the real problem fixed the nCellEnds is unnecessary.

Given that top-level table properties may be put either before or after the
table cells, the only way that works to import tables is to buffer a whole
top-level table row, but currently the buffer is replayed already at the
end of a nested table row.

Fortunately the RTF spec guarantees that \nesttableprops must occur
after the nested table cells of the nested row, so it should be
sufficient to remember the cell properties for the current nested table
row only, in addition to the cell properties for the top-level table row.

With this change, skipping a \nesttableprops destination when there is
a table style turns out to mangle ooo98040-1.rtf badly, so stop doing
that workaround.

RTFDocumentImpl::popState() was copying various buffers up the state
stack which is a clear indication that these shouldn't be members of
RTFParserState in the first place, move them to RTFDocumentImpl.

(cherry picked from commit c8f83ce1dbf5544f6aaa91775db6820a69c3c061)

Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx

Change-Id: Ic2d8f7b3e00844b224d61605b405ca651239e5f7
Reviewed-on: https://gerrit.libreoffice.org/8221
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fix "fix gcc inline assembler operands usage"

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

Resolves: #i118640# force early destruction of last FragmentHandler...

to not let it use an already destroyed RelationsMap instance
(cherry picked from commit 190444f7fd3fa9cfcd1955b3f5dcd916184d02f4)

Conflicts:
oox/source/core/xmlfilterbase.cxx

Change-Id: Ibd09ff9fcba8f919df0704c8e3a64423518b932f
(cherry picked from commit b071ce32befcc84a57a7ecd39667cb6658c0c866)

Fix a crash from crashtest

4  0x00002aaaaad1b3ab in rtl_uString_newFromSubString (ppThis=0x7ffffffeba48, pFrom=0x2aaaaad4236c <aImplEmpty_rtl_uString>, beginIndex=1, count=-2)
    at /home/julien/compile-libreoffice/libo/sal/rtl/strtmpl.cxx:1231
5  0x00002aaaec13e2b1 in rtl::OUString::copy (this=0x7ffffffebed0, beginIndex=1, count=-2) at /home/julien/compile-libreoffice/libo/include/rtl/ustring.hxx:1483
6  0x00002aaaec1717e3 in writerfilter::rtftok::RTFSdrImport::resolve (this=0x1aa4710, rShape=..., bClose=true)
    at /home/julien/compile-libreoffice/libo/writerfilter/source/rtftok/rtfsdrimport.cxx:356
7  0x00002aaaec134dfb in writerfilter::rtftok::RTFDocumentImpl::popState (this=0x20508a0)
    at /home/julien/compile-libreoffice/libo/writerfilter/source/rtftok/rtfdocumentimpl.cxx:4100
8  0x00002aaaec18327f in writerfilter::rtftok::RTFTokenizer::resolveParse (this=0x1aa46c0)
    at /home/julien/compile-libreoffice/libo/writerfilter/source/rtftok/rtftokenizer.cxx:106
9  0x00002aaaec11b269 in writerfilter::rtftok::RTFDocumentImpl::resolve (this=0x20508a0, rMapper=...)
    at /home/julien/compile-libreoffice/libo/writerfilter/source/rtftok/rtfdocumentimpl.cxx:644
10 0x00002aaaec297aa6 in RtfFilter::filter (this=0x1b658b0, aDescriptor=uno::Sequence of length 13 = {...})
    at /home/julien/compile-libreoffice/libo/writerfilter/source/filter/RtfFilter.cxx:122

Here are some debug:
8;5;(0,0);(0,13);(1694,13);(1694,0);(0,0);
aToken (0,0)
aToken (0,13)
aToken (1694,13)
aToken (1694,0)
aToken (0,0)
aToken

So must test that aToken is not empty

Change-Id: Ib5f0af3306a983c8531a5db732831d4d786ce9f5
Reviewed-on: https://gerrit.libreoffice.org/8173
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

my upc router automatically adds .net to the domain search path

i.e. I get handed an /etc/resolv.conf of

domain net
search net ...

and so "nohost" resolves to "nohost.net" which actually exists, so I get an
authentication request which is unexpected by this test which therefore falls
over. "nohost.invalid.net" also exists btw, as are other various foo.net forms
where foo is one of the reserved tld which don't themselves exist.

So lets shove a "*" into the name which is definitely invalid, sigh.

Change-Id: I8627ced9199f339ad6cca8f27752d883ebe74aad
(cherry picked from commit b3d153528a13807d2f5347ec83c7a8d483454a75)
Reviewed-on: https://gerrit.libreoffice.org/8180
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

fdo#69309 rename share/registry/postgresqlsdbc.xcd to postgresql.xcd

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

fdo#73869 fix highlight RTL Problem at the StartCenter window.

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

fdo#74751: fix reverse base point diagram on RTL UI

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

we only support simple labels in the InternalDataProvider, bnc#864396

Change-Id: Ie31c5c73bb5185125fd4493c4e476997e2e9bc63
Reviewed-on: https://gerrit.libreoffice.org/8190
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

OOXML chart import: ignore rot values outside the valid range

Change-Id: I506a78a024d761d1d263a7bb1dcbf09a4bbcf4ef

fdo#74345: Some shared formulas cannot be exported as shared formulas.

Excel's shared formula has some restrictions that Calc's doesn't have.
So we need to check each shared formula token to see if we can export
it as shared when saving to Excel. Refer to the "SharedParsedFormula"
section of the [MS-XLS] spec.

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

Updated core
Project: translations afbdfd5eb5dc98f74c1b5a7307d1bab852b79951

fdo#41524: CUPS printing: use "collate" option when PDF is available

Assume that the CUPS printer is able to handle collating by itself,
don't send multiple print jobs (except if user clicks on "Create single
print jobs for collated output" of course...).

To enable collating with PDF based printers, add the "collate" option;
legacy PS based printers still get the weird stuff read from the PPD
(not sure what the risks of changing that are).

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

vcl: CUPS printing: notify user if spooling failed

CUPS does not accept jobs for a printer that has been stopped; pop up
an error message in this case instead of silently ignoring failure.

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

fdo#74584: These tags should be lowercase for correct clipboard handling.

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

Add missing files to gallery bullets makefile

They are used in Bullets & Numbering dialog, and in
sidebar Bullets popup.

Change-Id: I543cad1108f8c45cc3dcc56a0c42fda2fbeb5467
Reviewed-on: https://gerrit.libreoffice.org/8125
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d8680de7012fb92a393066c957f82e1473b60575)
Reviewed-on: https://gerrit.libreoffice.org/8145
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

fdo#72041: Intern strings in the external ref cache with the host document.

To ensure that string comparison with those from the external ref cache
works correctly in functions such as VLOOKUP.

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

fdo#75130: Export cell borders to xls and xlsx correctly.

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

fdo#75118: sw: do not paint zero-width lines

Since commit 6a3fb868b2b8af21f7b6140424b6f8377599a786 zero-width
BorderLinePrimitive2D will actually be painted as hairlines by
VclPixelProcessor2D::tryDrawBorderLinePrimitive2DDirect(), so don't
create such pointless primitives.

(cherry picked from commit 128d3d51c208ec5c37a105ea5c751530bd017d4b)

fdo#75118: actually these are floats, compare with approxEqual

(cherry picked from commit 9fb9fc301502c2762ad4a8059d8d1c818d2843db)

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

fdo#75228: We still need to get the value only to pop value from the stack.

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

fdo#73565: Populate date members in a locale-safe way.

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

fdo#75032: Handle note copying correctly.

(cherry picked from commit 575e88da278f536ebfb6562dfd98f341240afec4)

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

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

Resolves: fdo#69925 Wiki Publisher Extension is not working

Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03
"compareTo" has been replaced by "==", so we compared the equality ot the pointers on the objects instead of the content of the strings
To make it simple and since we compare String objects, let's simply use "equals" method

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

don't generate broken XML files, related #i116460#

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

fdo#74857: Update the incrementer when skipping over hidden regions.

Otherwise it would over-shoot.

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

fdo#72491: Always set input as text when that's requested.

Even when the text begins with '='.

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

fdo#75206: use 'ne' for string comparison

Change-Id: I0d059933786119c3c26202c7b48d793404e5a0eb
Signed-off-by: Michael Stahl <mstahl@redhat.com>

chmod spadmin script executable

Change-Id: I008be78b41a20924c1dabe291157ef9633282fe6
(cherry picked from commit a67f3f73248f998764bea46292118aa2c9886c11)
Reviewed-on: https://gerrit.libreoffice.org/8114
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

fdo#41760 rhbz#1038189 refresh printer list when print dialog launched

which is the the same thing the printer settings dialog does

(cherry picked from commit 02efbed152a3a9e364cdb73628af0aed0f5d6f7a)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Change-Id: I36fb9f057b66faa8c9fce5a9934ed2fb70786363

Resolves: fdo#74070 make replace and with fields the same width

Change-Id: I2fbd7d6ed4e657660334a572768f12cbba1d75e2
(cherry picked from commit 8d464a7423ac8f3eb30eb80a0e5041989a4cc2da)
Reviewed-on: https://gerrit.libreoffice.org/8109
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

Resolves: fdo#74284 use AccessibleRole::PANEL for VclBoxes under windows

(cherry picked from commit 685ec1899435037205d98a102a32ca8b6a4836d0)

Change-Id: Ic8c743c2646c8610b3d90425024413b40dfdab13
Reviewed-on: https://gerrit.libreoffice.org/8103
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Update autocorrections for locale /fr/

Updated core
Project: dictionaries 94d0d2bee95f138a902d6ddc02b0407da00e3b1a

bump version to 4.2.3.0.0+

libreoffice-4-2-2 has been branched off the libreoffice-4-2-1 branch

Change-Id: Id1b347597b369ba9035fe528b2a4c348ce3de91e

prevent invalid OOXML files with trendlines, related #i88825#

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

multiple pivot tables on same sheet OOXML fix (part1), related #i83250#

This just fixes the generation of the pivot table file and the
relationship. It crashed in a dbgutil build because we tried to
overwrite the same stream for each pivot table on one sheet.

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

fdo#74709 RTF import: implement RTF_CLPAD*

(cherry picked from commit 6b5ef795ed4a56195bf09633b03e88474f0b133c)

Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx

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

Resolves: fdo#50451 Mediawiki formula export + vec use

Unicode Character 'COMBINING RIGHT ARROW ABOVE' wasn't taken into account

Change-Id: I4b5fc5fcfa4efe40fc92935e21af829edadf1dea
Reviewed-on: https://gerrit.libreoffice.org/8093
Reviewed-by: Frédéric Wang <fred.wang@free.fr>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

fdo#74357 DOCX import: avoid layout problem with automatic spacing

Commit 279ff2e03371542d014bf281e73282ba8080cf6b (bnc#816593 DOCX import:
fix auto para spacing without compat option, 2013-08-28) corrected the
value of "auto" paragraph spacing, but unfortunately this triggers a
layout problem:

warn:legacy.osl:12692:1:sw/source/core/layout/tabfrm.cxx:2513: debug assertion: <SwTabFrm::MakeAll()> - format of table lowers suppressed by fix i44910

resulting in "the rest of the table is not rendered by the layout".

Given that we backported the original fix to stable branches as well,
just stay on the safe side and revert back to the original behavior in
case the document requests the web layout.

(cherry picked from commit 8b6ff51bb89db0d7050bb4d00c0ec797b4754f25)

Conflicts:
writerfilter/source/dmapper/SettingsTable.cxx

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

fdo#74357 DOCX import: fix nested tables anchored inside tables

Regression from bbef85c157169efa958ea1014d91d467cb243e6f (bnc#779620
DOCX import: try harder to convert floating tables to text frames,
2013-10-01), the conversion of nested tables is delayed by default till
we know the page size. However, in case the anchor is in a table, we
should convert it right away, because the conversion of the parent table
would invalidate our XTextRange references.

(cherry picked from commit e5fd7c2dacf3c128cdc62622e736ce8abbc578a5)

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

rhbz#1065629: RTF import: don't drop nested cells if not enough \cellx

In this document written by "XMLmind XSL-FO Converter" there are less
\cellx than \cell and thus when reading \nestrow/\row a whole buffered
nested table \cell is lost and then subsequently the rest of the nested
table too. Try to fix that by counting both \cell and \cellx and
replaying until the maximum of those.

Cannot count \intbl since we synthesize that in various places.

(regression in LO 3.5)

Change-Id: I3b64ad94af842e076611418589a0c83bd18841c6
(cherry picked from commit 07ef4cf096015f0e427ffd17cd26bb6837e75481)
Reviewed-on: https://gerrit.libreoffice.org/8100
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fix invalid string access, related #i83611#

Change-Id: I5954f78e10d99a064f83e96282c28c086c7f07f1
Reviewed-on: https://gerrit.libreoffice.org/8096
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

add Collabora to wordbook

Change-Id: I2d667a84ff1f1523f37895aacf6f97a0b34b7c03
Signed-off-by: Jan Holesovsky <kendy@collabora.com>

Fix crash in css rgb color handling.

Crashing since 2000 (or earlier).

Change-Id: I9f91d56f380be2421370b0acbee351461e1f0973
Reviewed-on: https://gerrit.libreoffice.org/8091
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

the string is UTF8 and not Ascii

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

Resolves: fdo#72233 too long style names over-stretch dialog

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

fdo#74512: Fix the ODS export as well.

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

fdo#74218 add SVG header when exporting via mtf

Change-Id: Ia200fbf73c1464160ceddc705f72d77b5f1eff51
Reviewed-on: https://gerrit.libreoffice.org/8033
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fdo#72967 Draw position size tab - min size is 0 not 1 (mm)

Adjustment for size of an object had the minimum set to 1 (mm)
instead of 0.

Change-Id: I7d4c0998d2987448cea0fd7934649c02a513ac06
Reviewed-on: https://gerrit.libreoffice.org/8072
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

fdo#68927: sw: fix painting of SVG page background

There was a fix for a wrong constant resulting in too large image size in
a1a0830d1ac3ffabbe35bd8a0264b64f1f7a9d67, and it turns out that painting
of SVG backgrounds was relying on the wasteful rasterization: the SVG
is rasterized only once (at the initial zoom level) and then cached, and
now the correct image size for 100% is simply scaled up when zooming in.

Fix that by painting SVGs with the drawing layer primitives instead,
which appears to give better results.

Change-Id: I4be16856fd080290526d4963d8c512beefa85363
(cherry picked from commit c9cdc1252374a04f866c0715cb582cc08935d92d)
Reviewed-on: https://gerrit.libreoffice.org/8060
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fdo#74558: Re-implement BinarySearch() to disregard empty cell blocks.

The old code before the calc core refactoring took advantage of the old
calc storage which did not store empty cells at all. The new storage does
"store" empty cell blocks, and it did negatively affect the binary search
used for VLOOKUP. The revised binary search code properly skips empty cell
blocks so that it will work more like the old algorithm in 4.1.

This change also fixes fdo#72348, which was caused by the same root cause.

Change-Id: Ic20cc54d8dae26b62f5e9193cd21dad06ad10a3e
(cherry picked from commit 377d749ff8211fa9e69d47a92810af9bc0652990)
Reviewed-on: https://gerrit.libreoffice.org/8042
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

fdo#72390: Let's not skip auto styles from unmodified sheets.

We do re-use sheet XML stream for unmodified sheets on re-save, which
is okay. But skipping auto style population from unmodified sheets
is not okay because autostyles are shared across all sheets and written
outside the sheet XML streams. Skipping styles from unmodified sheets
could potentially fail to export used styles, not to mention could
cause a crash as reported in the bug.

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

fdo#73773: Check if the *document* is closing, not the *app*.

Otherwise it would crash if the app has multiple document instances open
and only one of them is being closed.

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

fdo#72691: Allow overwriting of string value with numeric one.

This can legitimately happen when you have a matrix with a reference to
another cell inside, and the referenced cell originally contained a
string value then later overwritten by a numeric value.

Example.  Put a "Text" in A1, and in B1 put a 1x1 matrix {=A1}.  It
displays "Text" in B1.  Then put 11 in A1.  Prior to this change, B1
would become blank.  With this change, B1 will display 11.

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

fdo#73800 fix incorrect separator in function description in Calc

Depending on locale, the function description with arguments did
show incorrect separator(s) for functions with PAIRED_VAR_ARGS.

Reviewed-on: https://gerrit.libreoffice.org/8052
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit f38aa72c1d8f9e535d2b5cefbb2af7f6f37b81a8)

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

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

don't crash in mixed reference/no reference cases, related fdo#59853

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

fdo#74683: java.lang.System.mapLibraryName dylib vs. jnilib confusion

Change-Id: I8fd7b908613a90c983f2244383432dd50ba10cdb
(cherry picked from commit a76261ac9e40eb57e942db2c7aea8b8a5e904ff2)
Reviewed-on: https://gerrit.libreoffice.org/8034
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

More java.lang.System.mapLibraryName dylib vs. jnilib confusion

...like a76261ac9e40eb57e942db2c7aea8b8a5e904ff2

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

fix crash when importing unsupported macro content, related fdo#59374

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

fix QPro import filter, related #i41688#

We desperately need a test document for this format.

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

fdo#50763: handle inlined base64 images

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
sw/source/filter/html/htmlgrin.cxx

Change-Id: I2e9d17dafcf91872d8ea19089e68d8fe652b3e4e
Signed-off-by: Andras Timar <andras.timar@collabora.com>

Related: fdo#74875 Filter of "nowiki" to be improved - Export to MediaWiki

<nowiki> mustn't be called almost everytime. Now this part still need some work (rework?)

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

Fix unit test case.

This would test for white spaces in text import.

(cherry picked from commit a850e62cd26a58a6ee9f3a2c8faa75ab10e96f8f)
Signed-off-by: David Tardon <dtardon@redhat.com>

fdo#73860 n#828390: New line is dropped while importing text.

(cherry picked from commit 840f4fc4d677740fc4b0ebcb658f4a828e184dad)
Signed-off-by: David Tardon <dtardon@redhat.com>
Change-Id: Id36181f64bd154d271446ef27a124a81af5c8620

fdo#74468 fix timing of slide transitions

Regression since commit 16428c9600964a4945cf6fd0d938dea047d1248b.

Change-Id: Id274c21e08d10d2e727f3b5a3fd852cd297e4637
(cherry picked from commit 78ff9d90f2a74792c437087ede11559c111c5c98)
Reviewed-on: https://gerrit.libreoffice.org/8029
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

bump version to 4.2.2.0.0+

Change-Id: I9763e7d8627d53f3b0d62dae916211a7396772d7

fix crash during xls import, related fdo#36580

Looks like a possibly invalid xls file but let us just do the right
thing and not crash.

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

fdo#74824: Update mdds to 0.10.2 which fixes one crasher bug.

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

Ensure that vector array has a numeric array of NaN's for empty range.

With this change, we ensure that mpNumArray is never NULL even when the
range consists entirely of empty cells. For an empty range, mpNumArray
will be non-NULL and filled with NaN's while mpStrArray will be NULL.

P.S. We need to backport this because without this, the existing OpenCL
code could lead to a crash during OpenCL enabled calculations.

(cherry picked from commit 2ec3127da35933fc6d5ac47ecedd0267f67c1d62)

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

corrected Estonian [et-EE] quote characters

Namely: Estonian has several sets of correct quote mark glyphs for double
quotes („”, „“, «» are all common), however the Institute of Estonian
Language [1] recommends using the first of these, i.e. „” (99 low, 99
high) [2]. As for single quotes, Estonian texts rarely use them, except in
a few fields such as linguistics and biology -- and both ‘’ (9-9) and ’’
(6-9) are considered correct [2, 3]. However, apostrophe in the beginning
of a word (which is effectively the same as a starting single quote) can
also be used to indicate omitted character(s) -- but there, only ’ (9) is
correct [3].

[1] Eesti Keele Instituut, the main official body which maintains and
studies the usage of Estonian language; http://en.eki.ee/index.php
[2] The last page of
https://docs.google.com/viewer?url=http://keeleabi.eki.ee/pdf/164.pdf (in
Estonian)
[3] Handbook of Estonian Language,
http://www.eki.ee/books/ekk09/index.php?p=2&p1=11&id=86 (in Estonian)

Change-Id: If88e6e03e3e4aa1919a25dbe2fa2ffc8c9a04f4a
(cherry picked from commit 51fc602184ab8d1afbfb183a3d25b1122c8b1e29)
Signed-off-by: Eike Rathke <erack@redhat.com>

Resolves: #i124179# trigger update User Fields...

and related Input Fields when user directly edits a User Field Input Field

- assure that no recursive updates occur

(cherry picked from commit 3c2b5242e81575ec4b6c110afd88894670bd2283)

Conflicts:
sw/inc/txtfld.hxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/usrfld.cxx

Change-Id: I36af4d5e8008f16737e3ec14c1ec737a5f43d3b1
(cherry picked from commit 50f0bb85b7e18001886fdf8bb03eb1d138838b90)

Resolves: fdo#74780 #i124178# correct export of User Variable Input Fields

(cherry picked from commit b95fa33a4d2827adb8e16de5bae4e535d8c826c9)

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

(cherry picked from commit 91f509fda9a04670e0752a214188be87bce1f2ac)

Change-Id: If645dd2f02ef0e511e44615339d6403cc469c784

fdo#73363: sd: fix mis-detection of Visio files as PPT

SdFilterDetect::detect() erroneously detects all binary MSO files, and
because the Visio types would be checked after PPT, Visio is pre-empted.

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

Resolves: fdo#74820 Failed to recognized Heading 6-Export to MediaWiki

See http://www.mediawiki.org/wiki/Help:Formatting

Change-Id: I6cf50e957d3aef6bff6e86a031da175d5544e98c
Reviewed-on: https://gerrit.libreoffice.org/7998
Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Do not reference a dangling OUString

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

Don't set JAVA_HOME on Mac OS X

...for one, it doesn't appear necessary there ("needed for awt"), and for
another setting it according to Oracle's JRE 7 would prevent a subsequent
visit to the Advanced preferences pane from listing Apple's JRE 6, as launching
that java and reading its system properties would be fooled by the JAVA_HOME and
report the Oracle system properties instead.

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

nPDescPos is never read

...since b48f4e99e1d2935f84bc2fac1e6670dd83939673 "#86296# use page descriptor
only if necessary", and this nicely removes the odd

for(i = 0; i < nPDescCount + 1; i++)

loop that read past the end of the maPageDescs vector.

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

Updated core
Project: translations 44e8f81735ce29b81fc6593d29c0e0f5e21f4f02

Related fdo#74597: Java on Mac doesn't use javaldx/library path fiddling

...so no need to return non-empty SunInfo::getLibraryPaths (for the Oracle JRE,
cf. how this had always returned an empty set for the Apple JRE in
otherjre.cxx).

This fixes the bug that selecting the Oracle JRE in the Advanced options pane
didn't stick, because jfw_areEqualJavaInfo was called on a JavaInfo read back
from XML where nRequirements had been cleared (in CNodeJavaInfo::loadFromNode)
and a JavaInfo where non-empty SunInfo::getLibraryPaths ->
VendorBase::needsRestart() == true -> nRequirements == JFW_REQUIRE_NEEDRESTART,
so always returned false.

(There's multiple errors here.  It is questionable whether jfw_areEqualJavaInfo
should take nRequirements into account, at least when used from
SvxJavaOptionsPage.  And VendorBase::getLibraryPaths appears to be only used to
compute VendorBase::needsRestart, ignoring the actual path data.  But leave that
for future clean-up.)

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