Public Git Hosting - LibreOffice.git/log

Branch libreoffice-4-3-6

This is 'libreoffice-4-3-6' - the stable branch for the 4.3.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.3.x release,
please use the 'libreoffice-4-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic5dea5548c385759a47789c8cc1206160d67f12a

classic draw rectangles "fit to contour" utterly broken

regression from

commit 3cbfcee36dd16e451d76c561eaaaee0ff29b01a5
Date:   Sun Feb 2 22:16:48 2014 -0600
    xub_StrLen and tools/string.hxx final straw

    There is still some 0xffff limit left and possibly some
    less than gracefully handled overflow/error cases

Change-Id: I82bdcb6951c42fdcaa68808a251f9b2f76f8ed0b
(cherry picked from commit 9977cbba8a36d3e6365cf886630d213ec7c1240c)
Reviewed-on: https://gerrit.libreoffice.org/13904
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

fdo#86772 show localized filter names in Save dialog

(cherry picked from commit a0a0317722c7cba51ab662ac662a5756e69f422a)

Also contains:

more traditional use of $(eval)

(cherry picked from commit 32fe73958055a51741ef68e643705ad0664824ef)

Conflicts:
filter/Configuration_filter.mk

add tranling empty line to ensure correct expansion

(cherry picked from commit 29dbc26b7eabddba374ff632f273ef4575d3055b)

Change-Id: I048454646e12af18917d90bb8077ec4b387cf589
Reviewed-on: https://gerrit.libreoffice.org/13909
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

Updated core
Project: translations 6e9e9a54efcbc972b9d989b64b311bdf7811fc71

update credits

Change-Id: I3d02e19235f201f9433271291d0ec72b96b5ae3f

'>>' must be '> >' in nested templates pre c++11

foo<bar<baz>> must be 'foo<bar<baz> >' with gcc44

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

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).

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

Ctrl+A and Data Sort took ages to broadcast ALL cells, fdo#81501 related

Noticed when investigating fdo#81501
Squashed commits:

Fix high memory usage when sorting cells in Calc. (fdo#81501)

Empty columns were being unnecessarily included in the sorting
range which caused extra allocation. This happens when you select
the entire sheet to sort. There was already code to skip empty
trailing cells in rows but not to skip empty columns.

Reviewed-on: https://gerrit.libreoffice.org/13294
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit c50d8bf596f527bb53b86dd04da652ed72f2c549)

actually use identical code for both byRow and byCol, fdo#81501 follow-up

(cherry picked from commit 1e4235f8b2dc693b0fb1edade9db25a631bdbf94)

trim also empty leading column ranges, fdo#81501 follow-up

(cherry picked from commit c7b57c6c2b15a4b9f65dafb642e3f1da402e62ca)

Ctrl+A and Data Sort took ages to broadcast ALL cells

... now that also empty cells are to be broadcasted.

Set dirty and broadcast only the effective data range as determined by Sort.

This is more a workaround, a cleaner solution would be to refactor the
SetDirty() algorithm to iterate only through broadcasters and use
AreaBroadcast() to notify area listeners.

However, this can also be easily backported to 4-3.

(cherry picked from commit 9a568c41ccd1ccf6073758973da5914a44f629d2)

982e03a12dd80be0787f22dce4495065775e7de0
eaeea85149e4b6d263b112205bb17c155e2d12be
6d68ca0088cec6a8328a3e93364ac928ef69babe

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

sw: fdo#88005: fix check in SwWW8ImplReader::StopApo()

404f16e97f1c2fcd8f9a1297bdfa46cba970467e is embarrassing crap; the real
problem there is that the paragraph that should be removed is _inside_
the frame, but in sf_68e4f217c107f6eada21adfe6e3c9c57-82055-minimized.doc
the MoveInsideFly() is not called so a non-empty body paragraph was removed.

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

Updated core
Project: dictionaries e1c4530a7e10e0a407a08f166b29b0105fd7f004

Update Portuguese dictionary to version 15.1.2.1

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

asan: global-buffer-overflow on fdo55736-1.docx

throws on master, be more conservative here

(cherry picked from commit 6b084f0001fc15112bf3c40d20a0c7096c83b7fe)

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

only delete cell content for CELLTYPE_NONE, fdo#88200

Change-Id: I43463b56cabfea4c9ee2b98445f7fb522221197d
Reviewed-on: https://gerrit.libreoffice.org/13843
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.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

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

Revert "fix Werror build"

This reverts commit cabf7158a8fa3eabda8d6436f46bdaf1a6ae8516.

Resolves: fdo#85617 always store fully encoded external document name

Also OOXML calls these API functions, this is the central place to handle it.

(cherry picked from commit 97a8b3ed5e5bd42e213d3230fa764b0f5d10f0f2)

write externalLink Relationship Target IURI encoded, fdo#85617 related

(cherry picked from commit 7eb5e135422f1a5830a44d129300bc3fafb4627d)

do not drop entire external reference, fdo#85617 related

If there are no matching tab names for a FileId, preserve at least the known
reference parts. In case of 2D references the sheet name is in the token if
for example read from .xlsx, only for 3D references the second sheet name
would be needed. The underlying makeExternalRefStr() and its subroutines
handle the missing tabname elements gracefully.

Still this situation is worth an assertion.

(cherry picked from commit b6339617b1cc3136f9e527acd0746d712cd21643)

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

handle index based external refs in formulas in ooxml import, fdo#85617

(cherry picked from commit 18cccd62fb5b730319878df6fac748d5cdf73f1f)

return after finding the reference

(cherry picked from commit cef36587674b6472471478524e87b1add4109507)

that method is the same as in the base class

(cherry picked from commit 02caf8f2eef75d8b5acb6a4ec40277355c3c6c6e)

remove copy&paste code

(cherry picked from commit 757ce63f7346aea132f11c3d9a328b0a1a776403)

a22b97b0a45d8d840095737638c2ccf68373e27a
8cb6f59795d9461c0e02ab70d7edd60af1410c1f
5710856fdb9fb91573de89eeb5a29d3d106ad7a6

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

fix Werror build

Change-Id: I1f29a83657894d234f93ce79edeab79fefacf3d1
Reviewed-on: https://gerrit.libreoffice.org/13849
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

fix Mac build

Change-Id: Ie5a25da16753bd28df0514a831512e147de6a715
Reviewed-on: https://gerrit.libreoffice.org/13848
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

fix Werror build

Change-Id: Ief706ff4dc74efe2a8cee69d9e9806e025394329
Reviewed-on: https://gerrit.libreoffice.org/13847
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

fdo#79810: SwTxtNode::IsIgnoredCharFmtForNumbering: ignore RES_CHRATR_COLOR

And also in SwTxtFormatter::NewNumberPortion(), use
SwTxtNode::IsIgnoredCharFmtForNumbering(), via
checkApplyParagraphMarkFormatToNumbering(). Otherwise the color of the
paragraph mark is inherited by the numbering portion, which is not what
IDocumentSettingAccess::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING
(mirroring Word's behavior) is supposed to do.

(cherry picked from commit b2c1474c1dc93b69f0ede03fc5c9ab496c669955)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
This fixes regression fdo#79810.

Conflicts:
sw/qa/extras/ooxmlexport/data/num-override-lvltext.docx
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
sw/source/core/text/txtfld.cxx

Change-Id: I5d8df9b404916cc4a4405bf796d971ede59e6111

sw: move IsIgnoredCharFmtForNumbering() to SwTxtNode

I need this in SwTxtFormatter.

(cherry picked from commit 96664bf0152ecf8ee64aa6b22ed399c1866117f1)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
sw/inc/ndtxt.hxx

Change-Id: Ib1586299f468a88e92fdb367fbab69a683791dc9

asan: global-buffer-overflow on ooo12093-1.doc

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

asan: stack-buffer-overflow with fdo76216-1.doc

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

handle all fill cases correctly, fdo#86754

That special case only works if the whole source range contains formula
cells. For now we just limit it to the special case of a single source
cell.

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

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

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

we want to compare two different cells, fdo#85353

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

reimplement shared formula import for xlsb, fdo#86734

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

fix another validation error for OOXML, related fdo#40746

e.g. exporting fdo40746-2.ods as OOXML

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

fix OOXML validation error, related fdo#40746

e.g. fdo40746-2.ods exported to OOXML

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

fix OOXML validation errors

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

we need the original context that contains the data, fdo#85856

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

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

import part for: " use correct xml element name, related fdo#45266"

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

Resolves fdo#87581: Pb to delete words with 2 initials in Autocorr Except

Cherry-picked from a5811c70bb443190a76a52585580659f96a58a04

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

handle relative refs correctly in xls import, fdo#80091

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

this horror depends on unsigned max increment to wrap-around to 0

understandable dbgutil out of bounds iterator checking regression from

commit 3af368f0f8e6691aa2eef177ccfcfcb95885c84b
Date: Tue Aug 14 21:03:04 2012 +0200
AnimationWindow: convert List to std::vector

(cherry picked from commit 1c32b8747e0a2051b9abcb1e681c3ca08c039269)
(cherry picked from commit 402e020c09ff0a003cfd8f84719ff3cde633a295)

Conflicts:
sd/source/ui/dlg/animobjs.cxx
sd/source/ui/inc/animobjs.hxx

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

Resolves: fdo#87823 Move Menu->New Menu

Change-Id: I677b519a1bcae3266baff4577b63971b6f8add75
(cherry picked from commit 3fda8cb3ed7c790d1b591f4f833054b777e5b490)
(cherry picked from commit fb5b995067702df770366b0af4c546a2b85c9f48)
Reviewed-on: https://gerrit.libreoffice.org/13770
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

relative refs wrap around in xls, fdo#84556

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

Resolves: fdo#82219 color graphics as black and white

i.e. revert

commit bb5c7d6a79309236d4f19bb2498f2e850f735a2f
Date:   Sun Apr 13 01:42:27 2014 +1000

    fdo#38844 Reduce XOR clipping for gradients

    Removed XOR clipping version of ClipAndDrawGradientMetafile. Because it
    has been removed, the other version isn't really needed in it's own
    function so I've moved it back into DrawGradient.

    Change-Id: Ib1519a019061c8c71183db63e5c11681bcad4cc4

(cherry picked from commit e2883ca86f747eb62d1fe9e9b8d115c689e3abd7)
Reviewed-on: https://gerrit.libreoffice.org/13773
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 938deff2a1e5451fd5493520480ae3c9615af3f9)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
vcl/source/outdev/gradient.cxx

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

Resolves: fdo#73165 don't restart timer if already running

If the timer is already running and you restart it then it starts counting down
again so the timeout occasion just keeps getting pushed out indefinitely.

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

Resolves: fdo#87612 don't overwrite users input if the value is unchanged

so you can enter values without them getting auto-expanded to their
canonical form as you're typing them and having the insertion
point jump to the start causing real confusion. But retain the
improvement of fdo#61704 where the value is set when modified so
clicking "ok" without leaving the field works as expected

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

fix compilation

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

fdo#88099 PostgreSQL-SDBC: use correct syntax for boolean comparisons

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

protect agains past-the-end string access

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

fdo#87292 use system dependent path instead of file URL

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

rhbz#1116534 crash when pasting over a formula

When pasting CSV data into existing document, we cannot use the
ScImportExport optimization for insertion, because the cells can already
have content (a grouped formula in this case). So use appropriate
ScDocument functions, even if that means the import is slower.

This is a regression from commit 93959db4d8846cfdfb87ab647c4d457fb09bb869
"use DocumentImport for csv import, related fdo#69006".

(cherry picked from commit bf97980c8d5d5fbc63a08b8834c10fe903152b75)

Conflicts:
sc/source/ui/view/viewfun5.cxx

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

Resolves: fdo#86978 append formula cells to track instead of tree

Cells in FormulaTree are assumed to be tracked already and their
dependents be notified. Also postpone tracking until all listeners are
established.

(cherry picked from commit 573f5dfba805b733dd2da62bde3cd5d9d25879d9)

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

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

fdo#87555 ComboBox in table should use same formatting as floating ComboBox

Same as fdo#67615 for TexFields, but for ComboBox.
Same problem, same cause, same solution.
ListBox seems not to have this problem :)

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

fdo#85258 differentiate between empty cell and empty result in matrix

Change-Id: I79259224e411f9c1a6e852623d9d49cf89a03c27
(cherry picked from commit 069698de192ef7e8d3582398e4542c175cabb987)
Reviewed-on: https://gerrit.libreoffice.org/13617
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)

Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b
3a541f74d3d25e1515a1c6d47f02ec6a8e817c93
15019072b6e812b9ffe29d3ee6afacd9ab526948
67b8fc324779875ba14e2d69204c40fe27cc180e
Reviewed-on: https://gerrit.libreoffice.org/13490
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Resolves: fdo#87840 by default hide all feature checkboxes

and explicitly show the supported ones

(cherry picked from commit fef5c2b81d1ac7d64e01521da792f470b03a1841)

Conflicts:
dbaccess/uiconfig/ui/specialsettingspage.ui

Change-Id: I93d998472a82085da9bd5a8ec7ad4cb39998e198
Reviewed-on: https://gerrit.libreoffice.org/13789
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>

Better fix for fdo#87558: Duplication in Last Used Functions sidebar list

Advantage compared to previous fix: in sidebar, last used function is put at the top

Still function from menu is sorted, the pb is we use InsertEntry, see
0  ImplEntryList::InsertEntry (this=0x32d0910, nPos=2147483647, pNewEntry=0x326f620, bSort=true)
    at /home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:144
1  0x00002aaab1b2444e in ImplListBoxWindow::InsertEntry (this=0x3287358, nPos=2147483647, pNewEntry=0x326f620)
    at /home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:750
2  0x00002aaab1b2a138 in ImplListBox::InsertEntry (this=0x3287100, nPos=2147483647, rStr="ACOT")
    at /home/julien/compile-libreoffice/libreoffice/vcl/source/control/ilstbox.cxx:2182
3  0x00002aaab1b47d51 in ListBox::InsertEntry (this=0x32e9ca0, rStr="ACOT", nPos=2147483647)
    at /home/julien/compile-libreoffice/libreoffice/vcl/source/control/lstbox.cxx:1001
4  0x00002aaad0c05d84 in formula::FuncPage::UpdateFunctionList (this=0x3217110) at /home/julien/compile-libreoffice/libreoffice/formula/source/ui/dlg/funcpage.cxx:153
should we create a new InsertEntry to force bSort=false?

Change-Id: Iba1b020aeea09951dead30f6781b24993aac98e0
Reviewed-on: https://gerrit.libreoffice.org/13725
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 585ab75a9344e140c876cb7565d3525a62fb8a73)
Reviewed-on: https://gerrit.libreoffice.org/13781
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 689afb19dc399ff3fcea07a6d264b61d10313a1e)
Reviewed-on: https://gerrit.libreoffice.org/13782
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#80968 file resultset seek table to before beginning on opening resultset

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

fdo#83354: Chart is truncated - moved down outside the margins of the object

Handle the case when the content height is unitialized (0).
When content height is 0 it means there is no content (so
we don't need to calculate adjustment) or the content height is
uninitialized which leads to wrong calculated value.

Regression from:
cb19042f4395c97d123a27c6960d5e30d666c010

(cherry picked from commit 89a81a6610cf316666291750e7300bcd1a97d062)

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

fdo#76780 don't limit PositionY to available width

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

move nScanLineBufferComponents to where it is used [-Werror=clobbered]

gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)

vcl/source/filter/jpeg/jpegc.cxx: In function ‘void ReadJPEG(JPEGReader*, void*, long int*, const Size&)’:
vcl/source/filter/jpeg/jpegc.cxx:72:10: error: variable ‘nScanLineBufferComponents’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
long nScanLineBufferComponents = 0;
^

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

workaround a weird gcc optimization werror bug

gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)

framework/source/fwe/classes/addonsoptions.cxx: In member function ‘void framework::AddonsOptions_Impl::ReadAndAssociateImages(const rtl::OUString&, const rtl::OUString&)’:
framework/source/fwe/classes/addonsoptions.cxx:267:16: error: array subscript is above array bounds [-Werror=array-bounds]
struct ImageEntry
^

The combination of aScaled[2]; aImage[2]; aURL[2] in sequence apparently lead
to some overoptimization and/or alignment problem, already declaring aImage[3]
helped (but not aScaled[3]), but that's not what we want.

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

-Wmaybe-uninitialized in ScTable::CopyColFiltered

apply same initialization as in ScTable::CopyRowFiltered

Change-Id: I9e8de6eaae3b3ad9453e5c06a88cfa93766becd9
Reviewed-on: https://gerrit.libreoffice.org/11263
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit 76ef9ecdb98252978dc10d11e98eb9a5cfad8acc)
Signed-off-by: Eike Rathke <erack@redhat.com>

remove warning: ‘nIndex’ may be used uninitialized

Change-Id: I317c2f4409f556ab967e4f08caa99cffcfce26cc
Reviewed-on: https://gerrit.libreoffice.org/11876
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit 430747397508f297be7ae1fa734a43ea705e9a43)
Reviewed-on: https://gerrit.libreoffice.org/13769
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

Related fdo#87840: mix between ignorecurrency and inputchecks

Cherry-picked from: 0f9ce69b327ee14f028c26e6af275779b8047def

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

asan: cast is totally wrong here

Change-Id: I7341813b706faad60888e374fa50542abeb6842d
(cherry picked from commit 3fab95491940160a1ee288491090b2f8b5875731)
Reviewed-on: https://gerrit.libreoffice.org/13747
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Resolves fdo#87968 : Assertion failed: false rtl_uString_newFromSubString

aNewText already contains the good string so calling copy method is wrong
(same pb for i18n::TransliterationModulesExtra::TITLE_CASE and
i18n::TransliterationModulesExtra::SENTENCE_CASE)

Change-Id: Ifce92f33e98af3a58a70d25da9c60cf3d584a001
Reviewed-on: https://gerrit.libreoffice.org/13724
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 31de7888660f551597263413bfdf467aade36680)
Reviewed-on: https://gerrit.libreoffice.org/13754

Related fdo#87789: groups should appear like views and not like tables

Cherry-picked from 84e3c5acb07937a073fedbe3d5389fc72123923a

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

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>

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>

bnc#862510: PPTX import: Wrong text horizontal adjustment inside shape.

When alignment is not specified, it should be set to the
default "left" value just on time, when properties are
pushed to the property set, otherwise uninitialized value
is better.

(cherry picked from commit 7a64988dbc7a1542aa38f0e8f9a8a47941fbc67d)

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

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

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

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

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

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

valgrind: Conditional jump or move depends on uninitialised value

Change-Id: Id5125052b49e322cdfa2c7d55d68e8a7a512965c
(cherry picked from commit bd03af56780aae3159dac8e40ee937824be3e906)

bnc#822341: PPTX export of embedded text documents

-Make embedded text documents exported by analogy with spreadsheet
embedded documents.
-Convert MS ole objects to LO sepcific objecst to allow
exporting those ole objects too.

Plus use gb_CppunitTest_use_rdb instead of wasting time on
finding out which missing components cause test failing.
Especcially when we have platform dependent components
(e.g. related to embedded object)

(cherry picked from commit 0c3d5fb0ad35ff7fc18917fc86fa58d9312fe3ae)

Conflicts:
sd/CppunitTest_sd_export_tests.mk
sd/qa/unit/export-tests.cxx

ERROR: Attribute 'spid' must appear on element 'p:oleObj'.

As pointed out by CppunitTest_sd_export_tests.

(cherry picked from commit 124c33dd1d6bf2040f0153de8c9ecaebe759c3bd)

ERROR: Invalid content was found starting with element 'p:pic'.

Again, as pointed out by CppunitTest_sd_export_tests. Sadly it seems that the
spec and PowerPoint is not in sync here, so just do what makes both happy. This
fixes the --with-export-validation build.

(cherry picked from commit cf15306ccf49da290b391517e2c5dd22a4f1be45)

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

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)

Revert "Resolves: #i124452# correct svg:viewBox for EnhancedCustomShape..."

This reverts commit c6e316f52021cc26d4c5ec9a7b87a07fbf595b62.
The bug #i124452# was in AOO only, no need to fix it in LibreOffice.
Especially when the "fix" causes regression. The related fdo#76334
should be fixed one day, but that is a different issue.

Conflicts:
xmloff/source/draw/ximpcustomshape.cxx

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

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

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

Updated core
Project: dictionaries 79e5674b3e1b10e659337ec1bad03101bf473608

Updated Slovenian thesaurus

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

fdo#87754: duplicated strings in an ItemList are not translated

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

Resolves fdo#87558: Duplication in Last Used Functions sidebar list

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

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

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

fdo#87199: sw: fix root cause of a11y crash when merging cells

Commit f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f is not quite right
because it will leave the mpNext chain unreachable; that could perhaps
be imporoved by calling RemoveFromLayout(), but...

Actually the problem is basically that one of the deleted SwCellFrms
points to a SwTableBox with getRowSpan() -1 (because it has been merged)
and thus IsInCoveredCell() returns true and that causes ~SwCellFrm() to
skip disposing the SwAccessible stuff, so the SwCellFrm is still
contained in the SwAccessibleMap.

Because it's rather hard to prevent this sort of thing in general,
better change SwAccessibleMap::Dispose() to assume that if it found its
way into the SwAccessibleMap it should be disposed and removed.

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

icu#11451 bidi, the gift that keeps on giving

Change-Id: I3bd37f8468c95a29ab3385dbc3ae825b76d8d3df
(cherry picked from commit bfb9eb550c4facb9aa6346a8d19f015cf5182668)
(cherry picked from commit 915153b2e14dd75a6c90f5f4b1ac01b7f47bafdb)

valgrind: initialize these

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

Resolves: rhbz#1175142 nStarts ends up as an invalid -1

Change-Id: Ic67c5562d0e9936cd6a524ecd4f798aaf885a6e8
(cherry picked from commit 1cd9420755dc5d5435bf564a992b727c455a3d73)
(cherry picked from commit 4e8ae0f8187a9d3fa77d737f5de248cfd9b0ed55)

Update mdds to 0.11.2.

(cherry picked from commit b7e61384f135f9f513659bcfd2502a9d00acd2f9)

Conflicts:
download.lst

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

libmspub depends on zlib

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

fdo#84685: writerfilter: RTF import: support \xe index entry

(cherry picked from commit f14e6e06b9e3c82c267649d63512a3538e5ee2f5)

(related fdo#84685): writerfilter: RTF import: support \tc TOC entry

(cherry picked from commit 1dd1dfc152c7cbeb374fe4f38b08c6af9cef2c06)

fix Windows build
(cherry picked from commit acfd640fd8547d3275c5db714b88d52b3fe7c4d5)

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

DOCX import: handle section break right after a ToC field

The symptom was that during the handling of the XE field, we tried to
access the top of the text append stack, but the stack was empty.

The situation is the following:

1) There is a multi-page TOC field.
2) The page break inside the field is described using a section break,
featuring headers, and the header contains a field that we map to a
fieldmark.
3) There is an XE field after all this.

The root cause was that during parsing of the header, some of the state
should be stashed away and restored when we're done. The new
HeaderFooterContext does exactly this, and now the number of push/pop
calls on the text append context match again.

(cherry picked from commit 153af84762f98d6c86c4c060b01402f40b2b0c24)

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

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

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.

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

fdo#87044: reportbuilder: Revert "fdo#67930 don't use variables ...

... for formattedtext in header/footer"

This reverts commit b0e3c6b8fa548defd5a3af2b8bf88b0b49589753.
This reverts commit fc92c1abebcfe9b18649d35b76bf22e001e332da.

The other fix from the libreoffice-4-1 branch seems to work better.

Change-Id: Idc5d7543c11dff74977729dab5afd978197dab6a
(cherry picked from commit d6ce95ae2288859fe74d601f1bdaf616ab1ee7f0)

fdo#67930 work around fdo#68024

don't emit string-value attribute

Change-Id: I3668b88437451523f2b6bb3c2c82e1929f7ba3d8
Reviewed-on: https://gerrit.libreoffice.org/5371
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
(cherry picked from commit 76408b0f0d7e91cddb8b056069a2ee547109b156)
(cherry picked from commit 1e10f6d229587ffc2a955c225b489645f8016e23)
Reviewed-on: https://gerrit.libreoffice.org/13458
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#85876: sw: fix attributes when splitting paragraph

fdo#74981: sw: fix input field handling when splitting paragraphs

The SwInputFld is copied because it doesn't have HasDummyChar() set
although it has 2 dummy characters; TODO why is that...

Change-Id: Iee91c1d0cf7a7a928e7383c1839f8192e8d4d5b0
(cherry picked from commit a1718045bd6218e07caebda7c4cacdcb853eabd3)

fdo#85876: Revert "fdo#74981: cutting nothing should do nothing, ...

... should fix field dupes"

This reverts commit f384598d8eec91c3c0f84a07ff3e59b8e3e13b3f.

The attributes have to be copied in case splitting a paragraph creates
an empty paragraph.

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

poppler: let's disable Qt5 too

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

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>
Reviewed-on: https://gerrit.libreoffice.org/13487
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

desktop: -Werror=unused-macros

The documented feature test macro is _BSD_SOURCE, and anyway, feature
test macros must be defined before the first libc header is included, so
this one is evidently useless.

Change-Id: Ib4b2db0c6151c2f3df322992b189257f5dd0ea22
(cherry picked from commit 2e69b60cc2abb8e0a6773e101c03050c57a12ca3)

fdo#86761 RTF import: positive border width and fLine=0 means no border

Regression from 01a32b7d074511bed24044dc94e1159aea62722b (fdo#85179 RTF
filter: import image border, 2014-10-23), there were a number of
problems here:

- CppunitTest_sw_htmlexport: revert back to the old behavior, where in
  case there is no border, we don't set the color of it.
- The testcase of the above commit omitted fLine=1 shape property, which
  is present in the original bugdoc, and only with that should we put a
  border around the shape.
- Let fLine=1 explicitly change the line style from NONE.
- dmapper: if line style is NONE, then don't bother setting the border
  color and width.

(cherry picked from commit 4568d1d298bf4fc98dcd86384743a04587a2fe6f)

Conflicts:
writerfilter/source/dmapper/GraphicImport.cxx

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

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/13449
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

fix range input in chart data source dialog

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

fdo#86215 pool new ScPatternAttr if source and destination are different docs

(cherry picked from commit d9c15867e914d91a7e86c499ffb6ee62f5b443f6)

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

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

Resolves: fdo#86931 wrong offsets used to set language

after Chinese conversion. the _aOldSel is the one
that has the start and end index set to the end of the
replacement text and so the calculation only makes
sense on that selection

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

Resolves: fdo#53460 crashes after casting SwTxtFrm to unrelated SwLayoutFrm

We still can't use ctrl+up to shrink the height of a row that has a table in
it, but it doesn't crash anymore.

This code presumably isn't truly table-in-table aware and should somehow step
"over" the embedded table and not "into" it, which is what I guess it is doing
here.

(cherry picked from commit 5141f2e0d89a8a10f0009bea40cc5cd15bf4fcc8)

Conflicts:
sw/source/core/layout/frmtool.cxx

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

Resolves: fdo#87189 don't draw negative canvas sizes

Change-Id: Ia52bc54084883817ffdd8ade06c3079865d52f70
(cherry picked from commit 6624484a608ed43fdeea1596f254915add671e08)
(cherry picked from commit 63a2168a6ea783d2c3824cdde8983dbfad147417)
Reviewed-on: https://gerrit.libreoffice.org/13414
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

Resolves: fdo#86843 avoid getting deleted before finishing Broadcast

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

Resolves: fdo#87141 Remove deletes the node, release doesn't

regression from introduction of boost::ptr_vector originally one had to Remove
and delete the return to delete it, while now the Remove automatically delete
it. This bare Remove to just "release" it seems to have been overlooked

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