LibreOffice.git
4 years agoBump version to 5.3-24cd-5.3-24
Andras Timar [Tue, 26 Sep 2017 21:05:56 +0000 (26 23:05 +0200)]
Bump version to 5.3-24

Change-Id: Ib019a1b3f84456cc2e41863672e686a5048ea089

4 years agoWord 2013 and 2016 does not honor the <w:view> setting, let's ignore it too.
Jan Holesovsky [Mon, 18 Sep 2017 11:17:39 +0000 (18 13:17 +0200)]
Word 2013 and 2016 does not honor the <w:view> setting, let's ignore it too.

In other words, let's open documents in the non-web view even when saved with
<w:view w:val="web"/>.

The behavior I see in Word 2013 (and it's documented that his happens in 2016
too) is that the setting is not a document setting any more, but user's
setting.  Ie. regardless of what is written in the file, the .docx document
opens in the Print Layout if the Word was in the Print Layout until now, and
in the Web Layout if it was that mode.

We handle the non-web layout much better than the web layout, so let's just
default to the normal layout on load.

Change-Id: Ieba7ddc280b9b79501a6b89ff21b03a86356583c
Reviewed-on: https://gerrit.libreoffice.org/42414
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/42413
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
4 years agotdf#112280: Export spin animation in PPTX.cd-5.3-23
Jan Holesovsky [Thu, 7 Sep 2017 17:26:07 +0000 (7 19:26 +0200)]
tdf#112280: Export spin animation in PPTX.

Contains also:

tdf#112280: Unit test.

Change-Id: I9f13bbc2bd3a3de582491ea5b2ad16535589420a
Reviewed-on: https://gerrit.libreoffice.org/42077
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
4 years agotdf#99617 convert powerpoint angle to degree
Regina Henschel [Tue, 14 Feb 2017 19:18:51 +0000 (14 20:18 +0100)]
tdf#99617 convert powerpoint angle to degree

1 powerpoint angle unit = 1/60000 degree
Roundtrip test not yet possible because of tdf#106002.

Change-Id: I5854c4f9f013f1a2db7e9536fc9cf5198c7a02ed
Reviewed-on: https://gerrit.libreoffice.org/34279
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/42076
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
4 years agobuild fix
Andras Timar [Wed, 6 Sep 2017 19:25:02 +0000 (6 21:25 +0200)]
build fix

Change-Id: Ic364e27f8ad4996ae1756ec57222cf37fd7ca814

4 years agoBump version to 5.3-23
Andras Timar [Wed, 6 Sep 2017 18:17:18 +0000 (6 20:17 +0200)]
Bump version to 5.3-23

Change-Id: I664a6fceae1dc90a7f5cd5deeda6351309776c5c

4 years agotdf#106867: Export videos in PPTX.
Jan Holesovsky [Tue, 5 Sep 2017 14:53:14 +0000 (5 16:53 +0200)]
tdf#106867: Export videos in PPTX.

Contains also:

tdf#106867: Implement pptx export of AnimationNodeType::COMMAND.
tdf#106867: Import target for commands in PPTX.
tdf#106867: Write also the extended markup to fully support embedded videos.
tdf#106867: Unit test for the export of embedded videos.

Change-Id: I7f4f389a72aa7ecef65d87f07bb69ba8f3374a14
Reviewed-on: https://gerrit.libreoffice.org/42020
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
4 years agotdf#111884: Implement export of group shapes in pptx.
Jan Holesovsky [Thu, 31 Aug 2017 16:32:58 +0000 (31 18:32 +0200)]
tdf#111884: Implement export of group shapes in pptx.

Contains also:

tdf#111884: Unit test.
related tdf#111884: GroupShapes are now handled in oox.

Change-Id: If12984c0670db6396cbfd0dcb8ae1f5a9b591705
Reviewed-on: https://gerrit.libreoffice.org/41766
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/42021
Tested-by: Jan Holesovsky <kendy@collabora.com>
4 years agoFix PageShape export to pptx
Paul Trojahn [Sat, 24 Jun 2017 11:46:46 +0000 (24 13:46 +0200)]
Fix PageShape export to pptx

The export code is not called, because the PageShape is actually
of type presentation.PageShape and not drawing.PageShape. A
PageShape has no text at all, which results in an empty p:txBody
element that fails validation, so it needs to be checked first if
the shape actually has text.

Change-Id: I559f15c2396739c74d5c4f36eb952754bc040ce8
Reviewed-on: https://gerrit.libreoffice.org/38574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/42002
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 9d43654080fcc5942610f57cbfec9827b9da2102)
Reviewed-on: https://gerrit.libreoffice.org/42018

4 years agolok - support for watermark
Marco Cecchetti [Sun, 3 Sep 2017 18:29:05 +0000 (3 20:29 +0200)]
lok - support for watermark

Extends doc_renderFont in order to generate text of requested size.

Change-Id: I0ebd48f8714b7772b764f3aba3e13754869c5117
Reviewed-on: https://gerrit.libreoffice.org/42015
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 8d2c21e31220540af83665b5e8ad2d9b66be6b3e)
Reviewed-on: https://gerrit.libreoffice.org/42019

4 years agoBump version to 5.3-22
Andras Timar [Tue, 29 Aug 2017 18:15:03 +0000 (29 20:15 +0200)]
Bump version to 5.3-22

Change-Id: I7907861c93175790d4aae27765a1239ecbc632a6

4 years agotdf#63673 Never ignore detected BOM
Maxim Monastirsky [Sun, 22 Jan 2017 18:24:02 +0000 (22 20:24 +0200)]
tdf#63673 Never ignore detected BOM

SwIoSystem::IsDetectableText was returning false only
because the detected line end isn't the same as the system
default one. Instead return true whenever there is a known
BOM or at least there is no 0x0, and actually use the
detected line end.

Change-Id: I20cc1642e7ad2e6e13dfb48c325a00c44f818f15
Reviewed-on: https://gerrit.libreoffice.org/33404
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 48da72b25b41614efd0689c20ef51ce420d53a70)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
4 years agotdf#111518 pptx: Add support for export of p:animMotion.
Jan Holesovsky [Wed, 9 Aug 2017 12:52:17 +0000 (9 14:52 +0200)]
tdf#111518 pptx: Add support for export of p:animMotion.

Contains also the following patches:

tdf#111518 pptx: Unit test.
related tdf#111518 pptx: These attributes are not supposed to be here.

Change-Id: Idd5692c803b1e8d434abc0154419a341934d0753
Reviewed-on: https://gerrit.libreoffice.org/40973
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
4 years agocrashtesting: 554 crashing documents on export to .doc
Caolán McNamara [Thu, 6 Jul 2017 14:57:50 +0000 (6 15:57 +0100)]
crashtesting: 554 crashing documents on export to .doc

regression from...

commit d72e0cadceb0b43928a9b4f18d75c9d5d30afdda
Date:   Mon Jun 19 15:32:16 2017 +0200

    Watermark: tdf#91687 correct size in the .doc

hopefully this fix is correct

Change-Id: I17512ffdd4db605e79b3adb97551e6f4e3816f2f
Reviewed-on: https://gerrit.libreoffice.org/39661
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 661fa18d424690e1c3bce4ac70a8018dabe82637)
Reviewed-on: https://gerrit.libreoffice.org/40406
(cherry picked from commit fa4a86135dda98c8b2de85a677ffb3cdc8f4e28b)
Reviewed-on: https://gerrit.libreoffice.org/40412
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit 93075f4df21a7d5202703e813be60f1b46996942)
Reviewed-on: https://gerrit.libreoffice.org/40974
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
5 years agoBump version to 5.3-21.cd-5.3-21
Jan Holesovsky [Wed, 19 Jul 2017 18:40:52 +0000 (19 19:40 +0100)]
Bump version to 5.3-21.

This does not have all the patches that the 5.3-21 will have, but those that
are relevant for the Online are going to be present in both.

Change-Id: I9231cc0b3a691096eb7c183acd344e4b4b55f22a

5 years agosd pptm: Preserve the VBA stream on export.
Jan Holesovsky [Wed, 19 Jul 2017 14:35:10 +0000 (19 16:35 +0200)]
sd pptm: Preserve the VBA stream on export.

This actually implements the reading of the VBA stream in Impress too, so the
user will get a warning when opening such a file (that the it contains
macros).

Change-Id: I1638199529196ed217cbd9ebef88eb7c88f2179a

5 years agolok: Add docm/xlsm/pptm filters to be known by LOK.
Jan Holesovsky [Wed, 19 Jul 2017 06:46:22 +0000 (19 08:46 +0200)]
lok: Add docm/xlsm/pptm filters to be known by LOK.

Change-Id: I4995498132b832ce783efc9740f1d7129f085a01

5 years agosd pptm: Add a separate PPTM filter.
Jan Holesovsky [Wed, 19 Jul 2017 06:42:36 +0000 (19 08:42 +0200)]
sd pptm: Add a separate PPTM filter.

Similarly to commit 697173f6fdfae581022cfdb5ec5171c5a3be58f0, we have to
preserve the correct content-type which is not the same for PPTX and PPTM.

This commit also changes sdfilt.component to use the constructor feature.

Change-Id: I4b334540ec07a53d308e6b9dd6403294842bddf8

5 years agocomphelper: Allow initializer lists for Sequences of NamedValues.
Jan Holesovsky [Wed, 19 Jul 2017 06:35:26 +0000 (19 08:35 +0200)]
comphelper: Allow initializer lists for Sequences of NamedValues.

This is particularly useful for creation of sequences that are later
unwrapped using comphelper::SequenceAsHashMap.

Eg.

    uno::Sequence<uno::Any> aArguments(comphelper::InitAnySequence(
    {
        {"SomethingNamed", uno::makeAny(true)},
    }));

    Reference<XExporter> xExporter(aFactory->createInstanceWithArguments(..., aArguments), UNO_QUERY);

and in the implementation:

    comphelper::SequenceAsHashMap aArgumentsMap(rArguments);
    mbSomething = aArgumentsMap.getUnpackedValueOrDefault("SomethingNamed", false);

Change-Id: Ib1135078a99ca08f50bf51184f2ec7d13f5e6b4d

5 years agoCPLinux-MPL.conf
Andras Timar [Fri, 7 Jul 2017 14:15:58 +0000 (7 16:15 +0200)]
CPLinux-MPL.conf

Change-Id: I35c364f207d0e3d8b2d029ec0456b2abc45841a1

5 years agotdf#107505: Impress - crash with two people co-editing one slide
Tamás Zolnai [Sat, 1 Jul 2017 12:48:22 +0000 (1 14:48 +0200)]
tdf#107505: Impress - crash with two people co-editing one slide

In tiledrendering mode cursor inside shapes are not handled very well now.
Different LO instances manipulates the same cursor instead of having
one separate cursor for all instances (as in case of simple text editing
in Writer).

Crashes caused by that one cursor is owned (created and destroyed) by one
LO instance but used by an other instance in the meantime. We can avoid
this by not making this cursor available to the other instances. Cursor is
hidden anyway so don't need to have it set to the corresponding Window.

Change-Id: Id78f79e73eda88f3c2c6aa7f534c32f3f8aba174
Reviewed-on: https://gerrit.libreoffice.org/39432
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 258df6f41d89a606a980942df6337d446634c0a6)
Reviewed-on: https://gerrit.libreoffice.org/39436
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
5 years agotdf#108995: take xml:space attribute into account
Mike Kaganski [Fri, 7 Jul 2017 08:33:34 +0000 (7 11:33 +0300)]
tdf#108995: take xml:space attribute into account

See paragraph 2.10 of XML 1.0 specification and 17.3.3.31 of ECMA-376-1:2016

Change-Id: I7f19d3b9cf2ccce88a5fa03022beeb99facc04fe
Reviewed-on: https://gerrit.libreoffice.org/39682
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 7c1a51516aaf2767e43b393259a1ad21570df5fb)
Reviewed-on: https://gerrit.libreoffice.org/39688
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
5 years agotdf#108714: Also support paragraph-level (line) breaks
Mike Kaganski [Fri, 7 Jul 2017 05:38:37 +0000 (7 08:38 +0300)]
tdf#108714: Also support paragraph-level (line) breaks

Change-Id: Ida55015363cac3ae29b82a60a9b9a5f1b39086a2
Reviewed-on: https://gerrit.libreoffice.org/39675
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit f95f0ce163743706a3670c6e33593023c22af2ff)
Reviewed-on: https://gerrit.libreoffice.org/39677
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
5 years agoBump version to 5.3-19
Andras Timar [Thu, 6 Jul 2017 21:09:27 +0000 (6 23:09 +0200)]
Bump version to 5.3-19

Change-Id: I4dd1be6ba50cbbba200db53e79f2eb502943ab14

5 years agotdf#108873 fix merge data handling in fields
Jan-Marek Glogowski [Tue, 4 Jul 2017 15:15:14 +0000 (4 17:15 +0200)]
tdf#108873 fix merge data handling in fields

This is a regression from tdf#70346 /
  commit 4851cde7b98226b0f82ae2b191c290173e9b06c6

It added the whole DB row as variables to the SwCalc hash set.
This works correct for conditionals when hiding sections, but not
for conditionals used in fields - actually they break.

Previously the field would do a fallback to query the DB again, if
no variable was in the dict and the only possible variables in the
dict could have been user-defined fields.

This handles the added variables correctly for fields.

Also fixes a bug to store the DB number values as number variables
and adds the record number, as SwCalc::VarLook does.

Change-Id: Ib0dbeda68234e671768ede55b2012235a3680276
Reviewed-on: https://gerrit.libreoffice.org/39509
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit f54c6938f73b94fb6f722f3ea68454fee424e62e)
Reviewed-on: https://gerrit.libreoffice.org/39613
(cherry picked from commit 5cde0b62fd074bca132caf6b6010aa002ccf7c87)

5 years agoSet error on more than max params (255) per function
Eike Rathke [Tue, 4 Jul 2017 13:22:23 +0000 (4 15:22 +0200)]
Set error on more than max params (255) per function

Parameter count is size byte, so.. SUM(1,1,1,...) with 256 arguments resulted
in 0 (uint8 wrapping around).

(cherry picked from commit 209cc5c211260a6c20cc6fb5ac02fd5a88100314)

Change-Id: Ib9997ad0d0d13d4c5171f276148b6c5cad570d5b
Reviewed-on: https://gerrit.libreoffice.org/39506
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 1d1bdfd94fc2963d0281ea4fd8d3a98e39f4ccf7)

5 years agotdf#107976 sw: let a view handle multiple transferables
Miklos Vajna [Sat, 27 May 2017 08:47:53 +0000 (27 10:47 +0200)]
tdf#107976 sw: let a view handle multiple transferables

Otherwise only the last transferable gets unregistered on closing the
view, which means a use-after-free when trying to paste something copied
from a closed document.

(cherry picked from commit 336f893c57c3c0281d4899629ad55603837d5d40)

Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
sw/source/uibase/inc/uivwimp.hxx

Reviewed-on: https://gerrit.libreoffice.org/39499
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 747be68119f2c85f1cdf6151fac67cd8cb840b76)

Change-Id: I65594e07fa4fefe7ae51a12455b755d64700a00d

5 years agotdf#101821 sw: layout: don't move endnotes into footnotes' container
Michael Stahl [Mon, 19 Jun 2017 09:40:12 +0000 (19 11:40 +0200)]
tdf#101821 sw: layout: don't move endnotes into footnotes' container

The bugdoc has a single 1-column section from start to end, no
footnotes but lots of endnotes, and the section has the settings
"Footnotes - collect at end of text" unchecked and "Endnotes - collect
at end of section" checked.

This means that the SwFootnoteContFrame for footnotes would be put
directly below the SwPageFrame (so that multiple sections on a single
page can share it), but the SwFootnoteContFrame for the endnotes is
put below the SwColumnFrame (which is created despite only 1 column)
below the SwSectionFrame.

Hence content in endnotes has the mbInfSct flag set, and the crash
happens because the endnotes are moved from below the SwSectionFrame to
a new SwFootnoteContFrame that is directly below a SwPageFrame, without
clearing the mbInfSct flag.

Fix the wrong call in SwFootnoteBossFrame::MoveFootnotes_() to
FindFootnoteBossFrame() that resulted in the wrong (unsuitable for
endnotes) SwFootnoteContFrame to be used as the target for the move.

Change-Id: I64f6b86441e5ac1f16433f005e97c274a1c69dfa
(cherry picked from commit 4c0b3520b66477334a7971dbed7ffcdcd265e749)
Reviewed-on: https://gerrit.libreoffice.org/39104
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 2d34d70eb928f6818d9f68f1da07673ce48f90ea)

5 years agohandle SID_ENCRYPTIONDATA for shared password protected docs, tdf#56173
Markus Mohrhard [Wed, 28 Jun 2017 00:15:04 +0000 (28 02:15 +0200)]
handle SID_ENCRYPTIONDATA for shared password protected docs, tdf#56173

Change-Id: Iadfe880b7be3186410a08568844d8812f176005d
Reviewed-on: https://gerrit.libreoffice.org/39332
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 669c12d59b6131f44945f166c77ae98df52ebb9e)
Reviewed-on: https://gerrit.libreoffice.org/39337
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 20ca5b5fae58ee46362fbd4c5f51ee21e89c3c35)

5 years agoalways import page scaling, tdf#65848
Markus Mohrhard [Wed, 28 Jun 2017 02:16:51 +0000 (28 04:16 +0200)]
always import page scaling, tdf#65848

Change-Id: If5bad2336443280dd33d750b1b2749a06f2b5101
Reviewed-on: https://gerrit.libreoffice.org/39334
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit fef72f9623bac7f9aa50b4f2606e6ec6282cfe1f)
Reviewed-on: https://gerrit.libreoffice.org/39340
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit ae56c9862222718871b6bf098162c2b8b4c44b82)

5 years agoResolves: tdf#108671 mark named expression single reference #REF! if deleted
Eike Rathke [Wed, 21 Jun 2017 17:42:36 +0000 (21 19:42 +0200)]
Resolves: tdf#108671 mark named expression single reference #REF! if deleted

Probably broken already since

    commit f77c9d5b3cb65d9c2e2417f60bec1113feac50e1
    Date:   Mon Jul 29 14:47:07 2013 -0400

Change-Id: If90a959d000a1bf5ab0804deb22d5cfad413ea5e
(cherry picked from commit 6580e171ad054dca38f55822e67a400191cecdf5)
Reviewed-on: https://gerrit.libreoffice.org/39072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 777103737f9b20f680d9c9f3d0610e91383f7499)

5 years agoResolves: tdf#107959 SdrGrafObj leak triggers later crash
Caolán McNamara [Mon, 22 May 2017 08:10:14 +0000 (22 09:10 +0100)]
Resolves: tdf#107959 SdrGrafObj leak triggers later crash

if the graphic doesn't change, then the cloned SdrGrafObj
persists beyond stylesheet destruction and blows up

Change-Id: I0013e7e118985c1334ab460507bc5c8271700160
(cherry picked from commit 118401aae4516bf4cc122e96b376d129ab3a3d5e)
(cherry picked from commit e4db2fc10ba4447fa5393853d0cfed795b260f0b)
Reviewed-on: https://gerrit.libreoffice.org/39261
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit c00af602013b840f4f92c15b259ce6cdeeaabcae)

5 years agoDon't let m_nGrabLevel become negative, tdf#108705 related
Eike Rathke [Thu, 29 Jun 2017 12:02:58 +0000 (29 14:02 +0200)]
Don't let m_nGrabLevel become negative, tdf#108705 related

... which then later leads to 2 Giga loops on the next GtkSalFrame dtor call,
for example on the second AutoFilter button popup in Calc.

Fall-out from

    commit 9b32355ea6d8d5e34363ba0c57e74d75d7a7b1b7
    Date:   Fri Jun 23 12:48:12 2017 +0100

        Resolves: tdf#108705 remove grabs on widget before destroying it

that brought this to surface.

Change-Id: I0edb7eec9384c716800f07ef1ed91fc8f1d7c119
(cherry picked from commit 637d917d7551fed19c9685f974fb3e732a8f97e2)
Reviewed-on: https://gerrit.libreoffice.org/39388
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 5eec9409f10d1a08c826edb689eefb86240b7b25)

5 years agotdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implemented
Michael Stahl [Tue, 27 Jun 2017 15:32:16 +0000 (27 17:32 +0200)]
tdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implemented

com.sun.star.ui.XUpdateModel was added in 5.1 so pre-existing extensions
don't implement it.

(regression from 0635208edf1cdee4235ea87666a473ac81007555)

Change-Id: I6749a9cf2fc82b9cd90d85a682247104e369e167
(cherry picked from commit d109948f0dd4190d7aca1e0fa7e2706ef3f40a6c)
Reviewed-on: https://gerrit.libreoffice.org/39312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 622d2b4c250f6c3cc67f10887f3e3ec9db3f69a5)

5 years agoFix a bit obscure pointer check
Marco Cecchetti [Wed, 5 Jul 2017 10:27:40 +0000 (5 12:27 +0200)]
Fix a bit obscure pointer check

Change-Id: Ib5276bacfb1b4e429960d93ddccdf63f61db6f03
Reviewed-on: https://gerrit.libreoffice.org/39574
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
5 years agosc lok: disable items of the overlay manager
Henry Castro [Sat, 1 Jul 2017 15:31:24 +0000 (1 11:31 -0400)]
sc lok: disable items of the overlay manager

They consume unnecessary CPU idle task in the tiled
redenring case

Change-Id: I477d17479ee83b31474675ef0d2317163d4fcee7
Reviewed-on: https://gerrit.libreoffice.org/39437
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/39439
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
5 years agosupport for saving a modified image instead of original version
Marco Cecchetti [Mon, 3 Jul 2017 14:33:36 +0000 (3 16:33 +0200)]
support for saving a modified image instead of original version

Normally when you save an image through the "Save..." entry in the
context menu for an image, the saved image is the original one more
eventually applied filters (which are not removeable).
Further applied transformations like rotation, cropping, color effects
are not included in the saved image.
This patch offers the user to choose if saving the original image
(with filters) or the modified version through a pop-up dialog.
The new feature is available in Writer, Draw and Calc.

Change-Id: I4f983e3a5e8a6839fa5789a96c4d8c44477c1fd7
Reviewed-on: https://gerrit.libreoffice.org/39487
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agotdf#108622: use correct type for last check timestamp during autocorrect
Aron Budea [Fri, 30 Jun 2017 21:57:35 +0000 (30 23:57 +0200)]
tdf#108622: use correct type for last check timestamp during autocorrect

It's only supposed to check the files once every 2-mins, with
mismatching type that happens each time.

Reviewed-on: https://gerrit.libreoffice.org/39428
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 51f616ddd7a2e3310e1b30dbd73d90e5138980ea)

Change-Id: Ie9243cf928d952e28989dd981508de86cb7dbddb

5 years agofix crash on windows with nullptr in operator<<
Markus Mohrhard [Fri, 30 Jun 2017 12:39:08 +0000 (30 14:39 +0200)]
fix crash on windows with nullptr in operator<<

E.g. http://crashreport.libreoffice.org/stats/crash_details/8962b764-6550-45c9-b08b-e99f5c968d61

Reviewed-on: https://gerrit.libreoffice.org/39413
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit ec822b7b716ebb14e717513aeaaf97a45b98bee9)

Change-Id: I1153c0ab35266006ada10611e79b770ef1c0cd4f

5 years agopBASM can be nullptr in copy docs, e.g. during insert sheet from doc
Markus Mohrhard [Fri, 30 Jun 2017 11:59:57 +0000 (30 13:59 +0200)]
pBASM can be nullptr in copy docs, e.g. during insert sheet from doc

Found through http://crashreport.libreoffice.org/stats/crash_details/3bd264ba-ec12-476a-9bb4-e832caca3445

Reviewed-on: https://gerrit.libreoffice.org/39411
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit caf1ddedbef77ac648d8b8b35978a0613aa77da6)

Change-Id: I0a4e6dddca61a2538c0fe6bbc51770a9886c464d

5 years agoBump version to 5.3-18cp-5.3-18
Andras Timar [Wed, 28 Jun 2017 20:39:53 +0000 (28 22:39 +0200)]
Bump version to 5.3-18

Change-Id: I2a46962eab6ca8ab5170437fad5b19c7377bcaf8

5 years agoWatermark: tdf#91687 correct size in the .doc
Szymon Kłos [Mon, 19 Jun 2017 13:32:16 +0000 (19 15:32 +0200)]
Watermark: tdf#91687 correct size in the .doc

Export:
* Watermarks saved using Writer were very small in the MSO.
  Export fUsegtextFStretch property in the Geometry Text
  Boolean Properties.
* tdf#91687: SnapRect contains size of Watermark after rotation.
  We have to export size without rotation.

Import:
* When import set height depending on used font and width.
  Text will keep the ratio. Remember the padding for export.

* added unit test
* introduced enum to avoid magic numbers for stretch and best fit
  properties.

Change-Id: I3427afe78488d499f13c543ca401c096161aaf34
Reviewed-on: https://gerrit.libreoffice.org/39355
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
5 years agotdf#108714 follow-up: handle deferred break in character group
Mike Kaganski [Wed, 28 Jun 2017 07:50:28 +0000 (28 10:50 +0300)]
tdf#108714 follow-up: handle deferred break in character group

If an out-of-order break happens immediately after a table, then
in following paragraph group (before character group start) the
table level is > 0, and break is ignored.

Since out-of-order break only happens at top level, the following
character group necessarily designates a new paragraph group, so
it's OK to handle that at the character group level, where table
level is already updated.

Change-Id: Ic1b1bb89e12407b050c2e880ad971794311845a5
Reviewed-on: https://gerrit.libreoffice.org/39347
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 553204015f954d20db65e6adcda68b823a8ef235)
Reviewed-on: https://gerrit.libreoffice.org/39352
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
5 years agotdf#108806: convert CRLF into space in OOXML text
Mike Kaganski [Tue, 27 Jun 2017 04:50:12 +0000 (27 07:50 +0300)]
tdf#108806: convert CRLF into space in OOXML text

Change-Id: I8e2e108a705ecdb55c096a589d83d51c48b0b83c
Reviewed-on: https://gerrit.libreoffice.org/39286
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/39322
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
5 years agotdf#108714: allow <w:br> as direct child of <w:body>
Mike Kaganski [Fri, 23 Jun 2017 11:48:03 +0000 (23 14:48 +0300)]
tdf#108714: allow <w:br> as direct child of <w:body>

LibreOffice doesn't accept <w:br> element as a child of <w:body>.

ECMA-376-1:2016 17.3.3.1 describes br as element of a run content,
and points to CT_Br in §A.1.
CT_Br may appear only as part of EG_RunInnerContent.
In turn, EG_RunInnerContent may appear only inside CT_R.

So, using <w:br> outside of <w:r> produces ill-formed OOXML.
Open XML SDK 2.5 Productivity Tool for Microsoft Office confirms that,
showing OpenXmlUnknownElement error.
However, Word accepts it as direct child of <w:body>. It behaves as if
the <w:br> were used as first element in first run of the following
<w:p> (thus creating page break after next paragraph).
Another Word bug that provokes third-parties to create ill-formed
documents, and requires LibreOffice to be bug-to-bug compatible.

This commit makes the following changes:
1. Registers a dedicated complex type CT_Br_OutOfOrder to handle those
unusual breaks, with corresponding handler function.
2. In the handler function, saves the gathered property set to parser
state to use later in next paragraph group handler.

This reproduces Word behaviour.

Change-Id: I5df6927e2de9266b58f87807319ad1c4977e45a7
Reviewed-on: https://gerrit.libreoffice.org/39168
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit a4a1467bc47b81ad68ecad0d5e2e163670582919)
Reviewed-on: https://gerrit.libreoffice.org/39303
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
5 years agoResolves: tdf#108643 don't restore orig size on first chart activate
Caolán McNamara [Mon, 26 Jun 2017 13:35:24 +0000 (26 14:35 +0100)]
Resolves: tdf#108643 don't restore orig size on first chart activate

Change-Id: Ibe51eb81ea1b0874fc1a9018871f07c9af38e8d2
Reviewed-on: https://gerrit.libreoffice.org/39268
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 59d93d41537fa806219d705a6d06ed26bf09f2f3)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
5 years agoResolves: tdf#108419 use spinfield preferred size as transparency widget size
Caolán McNamara [Fri, 16 Jun 2017 08:42:47 +0000 (16 09:42 +0100)]
Resolves: tdf#108419 use spinfield preferred size as transparency widget size

Change-Id: I7b5c8aeb087efe007c687dc1f206bcb0e8b0173e
Reviewed-on: https://gerrit.libreoffice.org/38866
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 459914cd491598c32cad203fed6c7b90491f6a52)

5 years agoofz#2392 restored props don't match saved props
Caolán McNamara [Mon, 26 Jun 2017 12:21:49 +0000 (26 13:21 +0100)]
ofz#2392 restored props don't match saved props

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

5 years agotdf#108732 ListBox: in absence of a field, treat data as string
Lionel Elie Mamane [Sat, 24 Jun 2017 13:10:59 +0000 (24 15:10 +0200)]
tdf#108732 ListBox: in absence of a field, treat data as string

so that one meaningfully compare it; default is DataType::OTHER,
which is not comparable

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

5 years agoResolves: tdf#108475 swipe only if some reasonable movement was involved
Caolán McNamara [Thu, 22 Jun 2017 16:22:17 +0000 (22 17:22 +0100)]
Resolves: tdf#108475 swipe only if some reasonable movement was involved

Change-Id: I5ee2a60f80728a2cca1401e43c8e27f852bfc657
Reviewed-on: https://gerrit.libreoffice.org/39118
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit be95033358460a3c411016297eb45a042460d4c2)

5 years agotdf#40713: dBASE, don't lose dbt file
Julien Nabet [Fri, 23 Jun 2017 21:55:50 +0000 (23 23:55 +0200)]
tdf#40713: dBASE, don't lose dbt file

if aDbtFile corresponds exactly to aTmpFile, we just have to return

Reviewed-on: https://gerrit.libreoffice.org/39189
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 36d91a65ab2db0c4c81e09771f6b44e1905122a0)

Change-Id: I1dde8efbe01838dc94f6025d5b81f5aee01932ac
Reviewed-on: https://gerrit.libreoffice.org/39196
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit e9cb227d3fd65ea46ffb926f2babb1926e5f2133)

5 years agotdf#55631: DBASE import (take 2)
Julien Nabet [Sun, 11 Jun 2017 07:34:47 +0000 (11 09:34 +0200)]
tdf#55631: DBASE import (take 2)

if we can't read head db_frei part, let's also put by default
m_eEncoding = RTL_TEXTENCODING_IBM_850;

Change-Id: I97601ba4c782dcfc280e975cc4498ea68407dd48
Reviewed-on: https://gerrit.libreoffice.org/38659
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com>
(cherry picked from commit 58bb9da339d61981d45cde8e38a2ce1ae33652c4)
Reviewed-on: https://gerrit.libreoffice.org/38707
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit 954931c86cf67876c8324acec31c3e95feeb6b4d)

5 years agoResolves: tdf#108292 WalkAndMatchElements: really limit the match
Eike Rathke [Wed, 21 Jun 2017 21:42:25 +0000 (21 23:42 +0200)]
Resolves: tdf#108292 WalkAndMatchElements: really limit the match

... to the columns queried, not just when entering an mdds node. Otherwise it
would return an unexpected index, plus bailing out early spares unnecessary
comparisons for the rest of a node block.

Regression of

    commit 3fed166279377f7ad702b8911899243b8adff3bf
    Date:   Fri Aug 16 16:29:38 2013 +0200

that started to use

    commit 7334f8db6f6004d48e2dbf014f27878a7ae21eb1
    Date:   Fri Aug 16 16:29:27 2013 +0200

with its bad implementation.

Just that VLOOKUP on a matrix with a larger block of same typed data as the
query *and* a match in an excess column seems to be rare..

Change-Id: Ia4ef3fd56490de82910d5aa13a84be2de851f9b0
(cherry picked from commit d3b77628efc72d857c63c8fb91d7ed2b499ac860)
Reviewed-on: https://gerrit.libreoffice.org/39082
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit f8f29503cc4fda0a2f3750f82ac5d7f784bdf0f6)

5 years agotdf#93968 bullet char style preview is unreadable, cause uses opensymbol
Caolán McNamara [Tue, 20 Jun 2017 10:44:47 +0000 (20 11:44 +0100)]
tdf#93968 bullet char style preview is unreadable, cause uses opensymbol

Change-Id: I1bd0a0e85c9d956184680d7e15709b3a7b590c30
Reviewed-on: https://gerrit.libreoffice.org/39010
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/39053
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit d8e6d7a86adb102ae1bb4df99ef73ebead962105)

5 years agoResolves: tdf#108705 remove grabs on widget before destroying it
Caolán McNamara [Fri, 23 Jun 2017 11:48:12 +0000 (23 12:48 +0100)]
Resolves: tdf#108705 remove grabs on widget before destroying it

Change-Id: If02a0b4340788db638c74b98e855258145643452
Reviewed-on: https://gerrit.libreoffice.org/39167
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit d8677b79fedda8a13f560e1a9a7ca8b36642366b)

5 years agotdf#101821 sw: fix layout footnote use-after-free in SwRootFrame
Michael Stahl [Thu, 22 Jun 2017 08:39:36 +0000 (22 10:39 +0200)]
tdf#101821 sw: fix layout footnote use-after-free in SwRootFrame

The ClearSwLayouterEntries() accesses anchored objects and if they are
anchored in footnotes then RemoveFootnotes() has already deleted them.

(regression from 962d0500c4debaef43e5f146e47e08c66d851562)

Invalid write of size 1
   at 0x4143CCB3: SwAnchoredObject::SetTmpConsiderWrapInfluence(bool) (anchoredobject.cxx:739)
   by 0x414D8A21: SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() (objstmpconsiderwrapinfl.cxx:58)
   by 0x414C943E: SwLayouter::ClearObjsTmpConsiderWrapInfluence(SwDoc const&) (layouter.cxx:401)
   by 0x411DBE57: sw::DocumentLayoutManager::ClearSwLayouterEntries() (DocumentLayoutManager.cxx:504)
   by 0x414D05D9: SwRootFrame::DestroyImpl() (newfrm.cxx:594)
   by 0x41535AB3: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:389)
   by 0x419E8171: std::_Sp_counted_deleter<SwRootFrame*, void (*)(SwFrame*), std::allocator<void>, (__gnu_cxx::_Lock_policy)2>::_M_dispose() (shared_ptr_base.h:464)
   by 0x40EB6DB5: std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release() (shared_ptr_base.h:150)
   by 0x40EB5E76: std::__shared_count<(__gnu_cxx::_Lock_policy)2>::~__shared_count() (shared_ptr_base.h:662)
   by 0x419E65F9: std::__shared_ptr<SwRootFrame, (__gnu_cxx::_Lock_policy)2>::~__shared_ptr() (shared_ptr_base.h:928)
   by 0x419E6615: std::shared_ptr<SwRootFrame>::~shared_ptr() (shared_ptr.h:93)
   by 0x419E619D: SwViewShell::~SwViewShell() (vnew.cxx:285)
  Address 0x5feb6eee is 334 bytes inside a block of size 488 free'd
   at 0x4C2F21A: operator delete(void*) (vg_replace_malloc.c:576)
   by 0x41488962: SwFlyAtContentFrame::~SwFlyAtContentFrame() (flyfrms.hxx:134)
   by 0x41535AFC: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:391)
   by 0x415360BD: SwLayoutFrame::DestroyImpl() (ssfrm.cxx:477)
   by 0x41535AB3: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:389)
   by 0x414A2FF4: sw_RemoveFootnotes(SwFootnoteBossFrame*, bool, bool) (ftnfrm.cxx:852)
   by 0x414A3104: sw_RemoveFootnotes(SwFootnoteBossFrame*, bool, bool) (ftnfrm.cxx:874)
   by 0x414A321A: SwRootFrame::RemoveFootnotes(SwPageFrame*, bool, bool) (ftnfrm.cxx:897)
   by 0x414D0558: SwRootFrame::DestroyImpl() (newfrm.cxx:585)
   by 0x41535AB3: SwFrame::DestroyFrame(SwFrame*) (ssfrm.cxx:389)
   by 0x419E8171: std::_Sp_counted_deleter<SwRootFrame*, void (*)(SwFrame*), std::allocator<void>, (__gnu_cxx::_Lock_policy)2>::_M_dispose() (shared_ptr_base.h:464)
   by 0x40EB6DB5: std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release() (shared_ptr_base.h:150)
   by 0x40EB5E76: std::__shared_count<(__gnu_cxx::_Lock_policy)2>::~__shared_count() (shared_ptr_base.h:662)
   by 0x419E65F9: std::__shared_ptr<SwRootFrame, (__gnu_cxx::_Lock_policy)2>::~__shared_ptr() (shared_ptr_base.h:928)
   by 0x419E6615: std::shared_ptr<SwRootFrame>::~shared_ptr() (shared_ptr.h:93)
   by 0x419E619D: SwViewShell::~SwViewShell() (vnew.cxx:285)

Change-Id: I147f46d49c90de46189ad34feed66c289adddc15
(cherry picked from commit c7782c7c27d85866872cc24a618df02504ff12ca)
Reviewed-on: https://gerrit.libreoffice.org/39106
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
(cherry picked from commit 6d4a041fe81b36e1e8f933bfe4216afcea72c76d)

5 years agoofz: use our own OString instead
Caolán McNamara [Fri, 12 May 2017 11:00:44 +0000 (12 12:00 +0100)]
ofz: use our own OString instead

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

Change-Id: I583a95aea0b29878bf4749a8cb2bb684da6da1e5

ofz: use OString instead of bare char*

Change-Id: I2f7bfbd62c0a5477f0cbb38e86684db4fdb9c37f
Reviewed-on: https://gerrit.libreoffice.org/38958
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 490a3e3bd98b300b5805891084fb7f09442ac7ea)

5 years agoResolves: rhbz#1454693 segv if tiled rendering is interrupted
Caolán McNamara [Fri, 16 Jun 2017 14:30:10 +0000 (16 15:30 +0100)]
Resolves: rhbz#1454693 segv if tiled rendering is interrupted

Change-Id: I1131f246c43806adb8a83f6eeafca2b734851a0e
Reviewed-on: https://gerrit.libreoffice.org/38890
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit c9eb6c7162a29a36f96d83c3dbe21d4e89df1470)

5 years agotdf#107684 DOCX export: fix duplicated <w:outlineLvl> element for styles
Miklos Vajna [Mon, 29 May 2017 09:25:58 +0000 (29 11:25 +0200)]
tdf#107684 DOCX export: fix duplicated <w:outlineLvl> element for styles

Next to the existing OutlineNumbering() (which is only used for styles),
commit fd2d14d5543c82eb875e720c98b51518699a8fbc (Implement DOCX export
of paragraph outline level, 2013-10-04) added ParaOutlineLevel() to the
attribute output class that also wrote the outline level of a paragraph
(style), but worked for the cases when the style was imported by
writerfilter as well.

As a side-effect styles imported by xmloff now have their outline level
property handled twice, leading to duplicated elements.

Fix the problem by only writing <w:outlineLvl> in ParaOutlineLevel():
it covers both use-cases, so no need to do anything in
OutlineNumbering().

Reviewed-on: https://gerrit.libreoffice.org/38132
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit fe13c249c8964355e39869a357c393f3208b6def)
Reviewed-on: https://gerrit.libreoffice.org/38637
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 35e62d9e649badfe00d0b8ea4c307d3fbbda735c)

Change-Id: Ic982dd70a00609cdfc3744a8ab69aaa828410fd0

5 years agoResolves: tdf#107438 write <text:sender-initials> for fields
Eike Rathke [Tue, 20 Jun 2017 10:59:23 +0000 (20 12:59 +0200)]
Resolves: tdf#107438 write <text:sender-initials> for fields

Only in <office:annotation> context write <loext:sender-initials>

Broken since

    commit 5f8476c00f482ab5c8707de2ebdcd41faa4057fc
    Date:   Fri Dec 13 23:21:46 2013 +0100

and

    commit 49f9694e34d07468cff4a7e4de332f11be3e0dd8
    Date:   Fri Dec 13 23:30:34 2013 +0100

Change-Id: I48b146b779878bf0faa5830a721559d8e864dd33
(cherry picked from commit 29f250c428953750ce89dec7ee961723478609c1)
Reviewed-on: https://gerrit.libreoffice.org/39012
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit cfb44fa3fa5449319c61023b9f9fb52ae87acc04)

5 years agoofz#2287 check multiply
Caolán McNamara [Sat, 17 Jun 2017 20:16:34 +0000 (17 21:16 +0100)]
ofz#2287 check multiply

Change-Id: Ibc4c93ac1f5686a476b5e303347dc951daa58e33
Reviewed-on: https://gerrit.libreoffice.org/38911
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 67caad3c98d045b8de3e4bf2f63efda2e9d8cc48)

5 years agoofz#2332 fix dangling pCObj
Caolán McNamara [Wed, 21 Jun 2017 08:16:33 +0000 (21 09:16 +0100)]
ofz#2332 fix dangling pCObj

Change-Id: Ifa62b1ce2aefa939cfceb2e110d126b785cb6e26
Reviewed-on: https://gerrit.libreoffice.org/39035
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit d185c58fcf8d7b82bc84b16b56020c3fbaf2a876)

5 years agotdf#89139: pivotCache: output sharedItems children only for string fields
Mike Kaganski [Thu, 22 Jun 2017 15:10:14 +0000 (22 18:10 +0300)]
tdf#89139: pivotCache: output sharedItems children only for string fields

... to avoid "corrupted" warning from Excel.
In case of string fields, Excel expects the item list to be present,
and containsXXX attributes of sharedItems to be absent, otherwise
it shows a warning about file corruption.
For numeric fields, it doesn't expect item list, othervise it also
warns about file corruption.

Change-Id: I5ded5b836587bed3177eb0a6b6c418e459e6be8b
Reviewed-on: https://gerrit.libreoffice.org/39114
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 47f0e83989c4c03d9690229b6433a5541032a3eb)
Reviewed-on: https://gerrit.libreoffice.org/39257
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
5 years agotdf#89139: dump pivotField items
Mike Kaganski [Tue, 13 Jun 2017 19:00:51 +0000 (13 22:00 +0300)]
tdf#89139: dump pivotField items

This makes the pivot table exported to XLSX refreshable (does not
crash Excel on pivot table refresh).

Change-Id: Icc35795cd116e091b75bb1d4a603c52ccc71c44d
Reviewed-on: https://gerrit.libreoffice.org/39018
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit 430774c4edcdba3e6a4e383d9ac9345a517e227f)
Reviewed-on: https://gerrit.libreoffice.org/39256
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
5 years agoRelated: tdf#108269 DOCM filter: preserve VBA stream
Miklos Vajna [Fri, 2 Jun 2017 16:41:38 +0000 (2 18:41 +0200)]
Related: tdf#108269 DOCM filter: preserve VBA stream

This is a combination of 3 commits (initial support, then two refactor
commits to not duplicate code.)

1st commit:

This means 2 new streams when roundtripping DOCM files that actually
have macros: word/vbaProject.bin and word/vbaData.xml (+ the relation
pointing to the second from the first).

Reviewed-on: https://gerrit.libreoffice.org/38360
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 8a59b30bb1af55f7afd8b98e4b60234f98d84c76)

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

Change-Id: Iba24eea4c5bca8f743a53027c71ed2aae48f1934

2nd commit:

Related: tdf#108269 DOCM filter: reuse oox code for VBA preservation

With this, the project stream import is shared between DOCM and XLSM.

Change-Id: I8fbffefc5acf28adea4875fa6bc4148a99b5ebef
Reviewed-on: https://gerrit.libreoffice.org/38495
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit e4adb8d9e77bab353dda26375e11a6b7a456368f)

3rd commit:

Related: tdf#108269 DOCM filter: reuse oox code for VBA data preservation

Which means the DOCM-specific code to roundtrip VBA things (project,
data) can be removed. The oox part has to be extended a bit, as at least
for this DOCM bugdoc there is an XML relation of the binary data, while
existing shared code assumed the full VBA project is just a single OLE
blob.

Reviewed-on: https://gerrit.libreoffice.org/38504
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 0129c2cd9dd95355412b194c595f4b986403ba1e)

Conflicts:
writerfilter/inc/ooxml/OOXMLDocument.hxx
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx

Change-Id: I4085e4dba24475e6fd555e5f34fe7ad0f305c57d
Reviewed-on: https://gerrit.libreoffice.org/38558
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
5 years agoRelated: tdf#108269 oox: ignore case when checking .docm extension
Miklos Vajna [Tue, 6 Jun 2017 09:32:02 +0000 (6 11:32 +0200)]
Related: tdf#108269 oox: ignore case when checking .docm extension

Also check for ".docm", not "docm" as a suffix.

Change-Id: Ib9d3474cfe3139ee1ea51210a5606cd52243fee5
Reviewed-on: https://gerrit.libreoffice.org/38430
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 1c768b975827c74e58944b8b12ab254891389edc)
Reviewed-on: https://gerrit.libreoffice.org/38557
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
5 years agotdf#108682 DOCX import: fix <w:spacing w:line=...> for negative values
Miklos Vajna [Thu, 22 Jun 2017 11:41:30 +0000 (22 13:41 +0200)]
tdf#108682 DOCX import: fix <w:spacing w:line=...> for negative values

I didn't find UI in Word to create

<w:spacing w:line="-260" w:lineRule="auto"/>

the equivalent markup when you set line spacing to exactly 13pt for new
documents is:

<w:spacing w:line="260" w:lineRule="exact"/>

The OOXML spec and Microsoft's implementer notes ([MS-OI29500]) is also
pretty silent about what a negative value means. However, if this markup
is converted to WW8 by Word, then the WW8 LPSD structure is like this
(as presented by doc-dumper):

<lspd type="LSPD" offset="5086">
  <dyaLine value="0xfefc"/>
  <fMultLinespace value="0x1"/>
</lspd>

For the 0xfefc value the [MS-DOC] spec clearly states that means the
type of the spacing is "exactly", with the value of 0x10000-0xfefc, i.e.
the same 260 twips.

Change-Id: I84b485d02dea49c610b6df2e06ccce03e1d29d21
Reviewed-on: https://gerrit.libreoffice.org/39091
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit f575f70b8303ba187f6989920281ff02e7a431c9)
Reviewed-on: https://gerrit.libreoffice.org/39162
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
5 years agoWatermark: auto size in the RTF
Szymon Kłos [Fri, 16 Jun 2017 12:54:35 +0000 (16 14:54 +0200)]
Watermark: auto size in the RTF

When Watermark size is set to Auto in the MSO,
the saved value is equal 1pt. Before this patch
in this case Watermark was invisible due to small size.

Change-Id: Ia2028a6547cf98dd31031305bcc5375625b83fe0
Reviewed-on: https://gerrit.libreoffice.org/38883
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agofix expat's MD5 sum
Andras Timar [Thu, 22 Jun 2017 09:37:35 +0000 (22 11:37 +0200)]
fix expat's MD5 sum

Change-Id: I5c6f230646504cb1a5167594a077580519859dc7

5 years agoexpat: upgrade to release 2.2.1
Michael Stahl [Wed, 21 Jun 2017 20:28:49 +0000 (21 22:28 +0200)]
expat: upgrade to release 2.2.1

fixes CVE-2017-9233 and CVE-2016-9063

Reviewed-on: https://gerrit.libreoffice.org/39078
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit fb1b69a78742373f5652e731d0f32da1d159422c)

Change-Id: Iee70d1265ff4e9dd4d0bff9602bd70b85d6b83f3

5 years agotdf#80671: mediawiki, no superscript tags allowed in footnotes
Julien Nabet [Sun, 11 Jun 2017 19:57:14 +0000 (11 21:57 +0200)]
tdf#80671: mediawiki, no superscript tags allowed in footnotes

Change-Id: I54c2cc0fc6b2a9c631fc83f59c2204dd5e374d2c
Reviewed-on: https://gerrit.libreoffice.org/38666
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 6a24160894e91c007d4a2f8ef193eed670909ea5)
Reviewed-on: https://gerrit.libreoffice.org/38669
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 1684ef2146dce6c132e3472b38b932d99f22b41c)

5 years agotdf#99680 modified clipping for PDF export
Vasily Melenchuk [Thu, 25 May 2017 10:44:52 +0000 (25 13:44 +0300)]
tdf#99680 modified clipping for PDF export

If clipping is requested, but no clipping region is defined,
clipping is ignored.

This squashes the following 3 commits:

Reviewed-on: https://gerrit.libreoffice.org/38021
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/38403
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/38694
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/38825
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit f6726209329fefe9decca8fda8e136b8472a95a2)

Conflicts:
vcl/qa/cppunit/pdfexport/pdfexport.cxx
no pdf unit tests on -5-3, so dropping those pieces

Change-Id: I793c1de1f4f6b0203727c0ff6aa8adecc43ad413
d4565858b0135b3177044558db87a68ef828955b
102722140e216cb9ad29107aae3bdaa70472d471
Reviewed-on: https://gerrit.libreoffice.org/38852
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 581806182ac7da81115c9675b4e828688178aa04)

5 years agoResolves: tdf#104875 defer filter detection to first load/update of external
Eike Rathke [Wed, 14 Jun 2017 21:30:57 +0000 (14 23:30 +0200)]
Resolves: tdf#104875 defer filter detection to first load/update of external

 This is a combination of 2 commits.

This could never have been meant

Since commit 67b374980f340faa2695001984aaf98886a32fad
executing ScDocumentLoader::GetFilterName() twice if there was no stored
filter, and still executing it if there was one, even if the comment says we
shouldn't.

(cherry picked from commit 1bc793f8ab8f9b4ce435bd3585f9579df4a11819)

Resolves: tdf#104875 defer filter detection to first load/update of external

Attempting to access all linked external documents right on load time was
specifically nasty for non-local URIs (unmounted smb, http, ...)

(cherry picked from commit 416752b9e4bc4605c479d3eff7797be9f0ef2a38)

f4a7414dfe36875b505c73b8c963b650eeffe204

Change-Id: Iaf4b88e63b3987fb661df0e9b095f06b29076894
Reviewed-on: https://gerrit.libreoffice.org/38820
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 4175045ebe4c895ff4617fbcdaacbbb058751597)

5 years agoFix screenshot missing quotes in code snippet
Olivier Hallot [Fri, 16 Jun 2017 19:21:44 +0000 (16 16:21 -0300)]
Fix screenshot missing quotes in code snippet

The code snippet suggested has no quotes in atttributes values.

Change-Id: I604fb34827da3bebf3f6759b491d719a96854754
Reviewed-on: https://gerrit.libreoffice.org/38895
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 4be3f2b3a9294c22de68b586d84328ec08906b84)

5 years agotdf#108418 Fix vertical alignment of checkbox text
Gabor Kelemen [Thu, 8 Jun 2017 16:50:37 +0000 (8 18:50 +0200)]
tdf#108418 Fix vertical alignment of checkbox text

Change-Id: I8daa6c2c5941a894259a5af74a16f7ef32f8a867
Reviewed-on: https://gerrit.libreoffice.org/38577
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 9d0ed8352ac9f27552f62d536c506f5cbc2a4afe)
Reviewed-on: https://gerrit.libreoffice.org/38956
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 50bab52194f570d48b92eb2f240dc4de7b3e1d3c)
Reviewed-on: https://gerrit.libreoffice.org/38963
(cherry picked from commit e3e8b30211528c451397c421f5815156522a70e3)

5 years agotdf#89064 Fix import of pages with comments and notes
Paul Trojahn [Tue, 6 Jun 2017 21:05:10 +0000 (6 23:05 +0200)]
tdf#89064 Fix import of pages with comments and notes

importSlide removes the shapes on the page. It was used to import
the comments and authors, which resulted in an empty notes page.

Reviewed-on: https://gerrit.libreoffice.org/38648
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit c2da33ead8b093b12ebb9a0ea9c06d156c41a3e6)

Change-Id: I7d68085b482e5497d46e92328c413c87440714a0

5 years agotdf#108118 sw: fix recursive layouting during SwCursorShell::Paint()
Michael Stahl [Fri, 9 Jun 2017 16:03:40 +0000 (9 18:03 +0200)]
tdf#108118 sw: fix recursive layouting during SwCursorShell::Paint()

The problem, in a nutshell, is that SwDrawContact::Changed() is called
during layout, and recursively starts another layout that removes a
drawing object that is being iterated over in frame #28
SwObjectFormatter::FormatObjsAtFrame_() from the layout.

Apparently SwDrawContact::Changed() is by far the most dangerous
function to call during layout; set the quite targeted flag
SetCallbackActionEnabled() to prevent the recursion.

0  SwSortedObjs::Remove(SwAnchoredObject&) (this=0x73e4a00, _rAnchoredObj=...) at sw/source/core/layout/sortedobjs.cxx:228
1  SwFrame::RemoveDrawObj(SwAnchoredObject&) (this=0x9430e20, _rToRemoveObj=...) at sw/source/core/layout/fly.cxx:2076
2  SwDrawVirtObj::RemoveFromWriterLayout() (this=0x95ce130) at sw/source/core/draw/dcontact.cxx:2199
3  SwDrawContact::DisconnectObjFromLayout(SdrObject*) (this=0x70fef00, _pDrawObj=0x95ce130) at sw/source/core/draw/dcontact.cxx:1663
4  SwLayoutFrame::DestroyImpl() (this=0x91c6c60) at sw/source/core/layout/ssfrm.cxx:489
5  SwFrame::DestroyFrame(SwFrame*) (pFrame=0x91c6c60) at sw/source/core/layout/ssfrm.cxx:389
6  SwLayoutFrame::DestroyImpl() (this=0x9435cd0) at sw/source/core/layout/ssfrm.cxx:500
7  SwPageFrame::DestroyImpl() (this=0x9435cd0) at sw/source/core/layout/pagechg.cxx:270
8  SwFrame::DestroyFrame(SwFrame*) (pFrame=0x9435cd0) at sw/source/core/layout/ssfrm.cxx:389
9  SwRootFrame::RemovePage(SwPageFrame**, SwRemoveResult) (this=0x36b26f0, pDelRef=0x7ffeafbf2e38, eResult=SwRemoveResult::Prev) at sw/source/core/layout/pagechg.cxx:1351
10 SwRootFrame::RemoveSuperfluous() (this=0x36b26f0) at sw/source/core/layout/pagechg.cxx:1426
11 SwLayAction::InternalAction(OutputDevice*) (this=0x7ffeafbf3250, pRenderContext=0x3595030) at sw/source/core/layout/layact.cxx:502
12 SwLayAction::Action(OutputDevice*) (this=0x7ffeafbf3250, pRenderContext=0x3595030) at sw/source/core/layout/layact.cxx:351
13 SwViewShell::ImplEndAction(bool) (this=0x364cc00, bIdleEnd=false) at sw/source/core/view/viewsh.cxx:279
14 SwViewShell::EndAction(bool) (this=0x364cc00, bIdleEnd=false) at sw/inc/viewsh.hxx:605
15 SwCursorShell::EndAction(bool, bool) (this=0x364cc00, bIdleEnd=false, DoSetPosX=false) at sw/source/core/crsr/crsrsh.cxx:259
16 SwRootFrame::EndAllAction(bool) (this=0x36b26f0, bVirDev=false) at sw/source/core/layout/pagechg.cxx:1728
17 SwDrawContact::Changed(SdrObject const&, SdrUserCallType, tools::Rectangle const&) (this=0x70fef00, rObj=..., eType=SdrUserCallType::MoveOnly, rOldBoundRect=...) at sw/source/core/draw/dcontact.cxx:985
18 SdrObject::SendUserCall(SdrUserCallType, tools::Rectangle const&) const (this=0x95ce130, eUserCall=SdrUserCallType::MoveOnly, rBoundRect=...) at svx/source/svdraw/svdobj.cxx:2736
19 SdrObject::Move(Size const&) (this=0x95ce130, rSiz=Size = {...}) at svx/source/svdraw/svdobj.cxx:1482
20 SwDrawVirtObj::Move(Size const&) (this=0x95ce130, rSiz=Size = {...}) at sw/source/core/draw/dcontact.cxx:2366
21 SwAnchoredDrawObject::SetObjTop_(long) (this=0x95ce250, _nTop=777490) at sw/source/core/layout/anchoreddrawobject.cxx:677
22 SwAnchoredObject::SetObjTop(long) (this=0x95ce250, _nTop=777490) at sw/source/core/layout/anchoredobject.cxx:593
23 objectpositioning::SwToContentAnchoredObjectPosition::CalcPosition() (this=0x7ffeafbf3980) at sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx:739
24 SwAnchoredDrawObject::MakeObjPosAnchoredAtPara() (this=0x95ce250) at sw/source/core/layout/anchoreddrawobject.cxx:421
25 SwAnchoredDrawObject::MakeObjPos() (this=0x95ce250) at sw/source/core/layout/anchoreddrawobject.cxx:318
26 SwObjectFormatter::FormatObj_(SwAnchoredObject&) (this=0x90623d0, _rAnchoredObj=...) at sw/source/core/layout/objectformatter.cxx:374
27 SwObjectFormatterTextFrame::DoFormatObj(SwAnchoredObject&, bool) (this=0x90623d0, _rAnchoredObj=..., _bCheckForMovedFwd=false) at sw/source/core/layout/objectformattertxtfrm.cxx:126
28 SwObjectFormatter::FormatObjsAtFrame_(SwTextFrame*) (this=0x90623d0, _pMasterTextFrame=0x0) at sw/source/core/layout/objectformatter.cxx:443
29 SwObjectFormatterTextFrame::DoFormatObjs() (this=0x90623d0) at sw/source/core/layout/objectformattertxtfrm.cxx:328
30 SwObjectFormatter::FormatObjsAtFrame(SwFrame&, SwPageFrame const&, SwLayAction*) (_rAnchorFrame=..., _rPageFrame=..., _pLayAction=0x0) at sw/source/core/layout/objectformatter.cxx:191
31 SwHeadFootFrame::FormatSize(long, SwBorderAttrs const*) (this=0x91c6c60, nUL=663, pAttrs=0x8fbc530) at sw/source/core/layout/hffrm.cxx:263
32 SwHeadFootFrame::Format(OutputDevice*, SwBorderAttrs const*) (this=0x91c6c60, pRenderContext=0x3595030, pAttrs=0x8fbc530) at sw/source/core/layout/hffrm.cxx:416
33 SwLayoutFrame::MakeAll(OutputDevice*) (this=0x91c6c60) at sw/source/core/layout/calcmove.cxx:913
34 SwFrame::PrepareMake(OutputDevice*) (this=0x91c6c60, pRenderContext=0x3595030) at sw/source/core/layout/calcmove.cxx:346
35 SwFrame::Calc(OutputDevice*) const (this=0x91c6c60, pRenderContext=0x3595030) at sw/source/core/layout/trvlfrm.cxx:1783
36 lcl_FormatLay(SwLayoutFrame*) (pLay=0x91c6c60) at sw/source/core/layout/pagechg.cxx:360
37 lcl_FormatLay(SwLayoutFrame*) (pLay=0x9435cd0) at sw/source/core/layout/pagechg.cxx:357
38 SwPageFrame::PreparePage(bool) (this=0x9435cd0, bFootnote=false) at sw/source/core/layout/pagechg.cxx:456
39 (anonymous namespace)::doInsertPage(SwRootFrame*, SwPageFrame**, SwFrameFormat*, SwPageDesc*, bool, SwPageFrame**) (pRoot=0x36b26f0, pRefSibling=0x7ffeafbf43c8, pFormat=0x3076050, pDesc=0x3076010, bFootnote=false, pRefPage=0x7ffeafbf43d8) at sw/source/core/layout/pagechg.cxx:1210
40 SwFrame::InsertPage(SwPageFrame*, bool) (this=0x3620d70, pPrevPage=0x9227900, bFootnote=false) at sw/source/core/layout/pagechg.cxx:1269
41 SwFrame::GetNextLeaf(MakePageType) (this=0x3620d70, eMakePage=MAKEPAGE_INSERT) at sw/source/core/layout/flowfrm.cxx:994
42 SwFrame::GetLeaf(MakePageType, bool) (this=0x3620d70, eMakePage=MAKEPAGE_INSERT, bFwd=true) at sw/source/core/layout/flowfrm.cxx:797
43 SwFlowFrame::MoveFwd(bool, bool, bool) (this=0x3620e18, bMakePage=true, bPageBreak=false, bMoveAlways=false) at sw/source/core/layout/flowfrm.cxx:1851
44 SwContentFrame::MakeAll(OutputDevice*) (this=0x3620d70) at sw/source/core/layout/calcmove.cxx:1681
45 SwFrame::PrepareMake(OutputDevice*) (this=0x707a340, pRenderContext=0x3595030) at sw/source/core/layout/calcmove.cxx:312
46 SwFrame::Calc(OutputDevice*) const (this=0x707a340, pRenderContext=0x3595030) at sw/source/core/layout/trvlfrm.cxx:1783
47 GetFrameOfModify(SwRootFrame const*, SwModify const&, SwFrameType, Point const*, SwPosition const*, bool) (pLayout=0x36b26f0, rMod=..., nFrameType=(SwFrameType::Txt | SwFrameType::NoTxt), pPoint=0x707c6f0, pPos=0x707c720, bCalcFrame=true) at sw/source/core/layout/frmtool.cxx:3247
48 SwContentNode::getLayoutFrame(SwRootFrame const*, Point const*, SwPosition const*, bool) const (this=0x71328c0, _pRoot=0x36b26f0, pPoint=0x707c6f0, pPos=0x707c720, bCalcFrame=true) at sw/source/core/docnode/node.cxx:1118
49 SwRootFrame::CalcFrameRects(SwShellCursor&) (this=0x36b26f0, rCursor=...) at sw/source/core/layout/trvlfrm.cxx:2028
50 SwShellCursor::FillRects() (this=0x707c680) at sw/source/core/crsr/viscrs.cxx:609
51 SwSelPaintRects::Show(std::__debug::vector<rtl::OString, std::allocator<rtl::OString> >*) (this=0x707c680, pSelectionRectangles=0x7ffeafbf5570) at sw/source/core/crsr/viscrs.cxx:332
52 SwShellCursor::Show(SfxViewShell*) (this=0x707c680, pViewShell=0x0) at sw/source/core/crsr/viscrs.cxx:619
53 SwCursorShell::Paint(OutputDevice&, tools::Rectangle const&) (this=0x364cc00, rRenderContext=..., rRect=...) at sw/source/core/crsr/crsrsh.cxx:1283
54 SwEditWin::Paint(OutputDevice&, tools::Rectangle const&) (this=0x3595030, rRenderContext=..., rRect=...) at sw/source/uibase/docvw/edtwin2.cxx:476

Change-Id: I1b237f0f425e58bb95bae9f19019f26fe5da21fd
(cherry picked from commit 2ca0360a6c75959bf61bd2ee0ef96b2729369a15)
Reviewed-on: https://gerrit.libreoffice.org/38619
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9fa193f1a17eac56c19f611c76c2cdd022487b9e)

5 years agoResolves: tdf#104989 a matrix/array formula cell needs to have dimensions
Eike Rathke [Thu, 15 Jun 2017 11:05:16 +0000 (15 13:05 +0200)]
Resolves: tdf#104989 a matrix/array formula cell needs to have dimensions

 This is a combination of 2 commits.

Resolves: tdf#104989 a matrix/array formula cell needs to have dimensions

Most spreadsheet functions don't need it, but some may.

(cherry picked from commit 033d018a3a1d345d61f3c4dc4da693cdd4004dea)

Ensure all cases push an error return, tdf#104989 related (not the cause)

A formula cell in matrix context could have no dimensions.. (which is the cause
but elsewhere).

(cherry picked from commit e6abe9c3d06d6776e05bef93b5e6f87b403ea967)

1a04f9808d8f5c802789e3db77052351b24c24c7

Change-Id: I954acaa0a64c4dac8d15acd5b3f404019a7e0bce
Reviewed-on: https://gerrit.libreoffice.org/38832
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit b85a1921585d70323c1c10ea6a7d29f1aa00ed25)

5 years agoupload graphite 1.3.10
David Tardon [Thu, 15 Jun 2017 14:02:48 +0000 (15 16:02 +0200)]
upload graphite 1.3.10

Change-Id: Ib70e1c08a11465f5a65be8cd0c892e8f7667b478
Reviewed-on: https://gerrit.libreoffice.org/38837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 619d93c8f660b26e19f41c6908807819ac783958)
Reviewed-on: https://gerrit.libreoffice.org/38845
(cherry picked from commit ac80b0687b4a9ed345be68e446dbf11258ef0b28)

5 years agouse correct size
David Tardon [Thu, 15 Jun 2017 11:17:40 +0000 (15 13:17 +0200)]
use correct size

(cherry picked from commit d1ae31a1fc49ec7a68b2a07c5e5e97d95b346ca9)

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

5 years agotdf#107666: EDITING: No caret outside the textbox after inserting a textbox
Tamás Zolnai [Sun, 18 Jun 2017 15:03:07 +0000 (18 17:03 +0200)]
tdf#107666: EDITING: No caret outside the textbox after inserting a textbox

This reverts commit 44555103217df34b218787f3dc6a2634b41fe52e.

Now revert the related commit, need to revisit the original bug later.

Change-Id: I08f42c4e859277ab411e4be5ad065fe3cca8bbb6
Reviewed-on: https://gerrit.libreoffice.org/38927
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
5 years agoWatermark: RTF font import and export
Szymon Kłos [Wed, 7 Jun 2017 07:36:06 +0000 (7 09:36 +0200)]
Watermark: RTF font import and export

* font size
* font family
* rotation
* TextPath geometry - working transparency & color

* revert TextBox export removed by mistake

Change-Id: I3f6df86809ae57dc40c275652a96b19d2a3d7eba
Reviewed-on: https://gerrit.libreoffice.org/38494
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit dd0df1c8a213ab6f0959145396bc273bf885af39)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
5 years agoResolves: tdf#108187 fatal exception on testing if ooxml is a odf
Caolán McNamara [Fri, 2 Jun 2017 10:57:30 +0000 (2 11:57 +0100)]
Resolves: tdf#108187 fatal exception on testing if ooxml is a odf

Change-Id: Ie88a66aa8d73bb3c4045629604756470ce51b92b
Reviewed-on: https://gerrit.libreoffice.org/38354
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 5e0e1facbdf1c4a2a3db253aa39c6253506a2f1b)

5 years agoupdate credits
Christian Lohmaier [Tue, 13 Jun 2017 22:28:47 +0000 (14 00:28 +0200)]
update credits

Change-Id: I873b10323375d17b0a3bce1fb578c8169dd5c2b7
(cherry picked from commit 458fadbaf7b7f816a01304b48c0938407e65f060)
(cherry picked from commit 7cf6a646f06845c705a50ea7c5743b3792604be9)

5 years agotdf#103091 conditional style conditions not saved
Troy Rollo [Tue, 6 Jun 2017 07:41:33 +0000 (6 17:41 +1000)]
tdf#103091 conditional style conditions not saved

Change-Id: Iccf3eb531ee3382d27105e5ccce6013707a646b6
Reviewed-on: https://gerrit.libreoffice.org/38451
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit a5b4cb3f836c991d0647f55e1ef4920ce6115eac)
Reviewed-on: https://gerrit.libreoffice.org/38747
(cherry picked from commit e9869b9b38d4e4e7f893aecb26f73d985f17e350)

5 years agoBump version to 5.3-17cp-5.3-17
Andras Timar [Tue, 13 Jun 2017 10:22:41 +0000 (13 12:22 +0200)]
Bump version to 5.3-17

Change-Id: Ia47411718c0f2e8c3cf5196686b7927a95e9d8ac

5 years agotdf#98888: mediawiki inserts redundant emptylines in <ref>
Julien Nabet [Tue, 6 Jun 2017 21:15:20 +0000 (6 23:15 +0200)]
tdf#98888: mediawiki inserts redundant emptylines in <ref>

There's a newline in case of heading, table or bibliography following text:p
ok but only if we're not in text:note node

Change-Id: I71172751a51e29abdd770e758d27b1bc8f15cb0d
Reviewed-on: https://gerrit.libreoffice.org/38470
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 8a400cfa468655142103f18f722adf1d5cbda9c7)
Reviewed-on: https://gerrit.libreoffice.org/38485
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 509fb27b9b630f8506af6104f8230b0efa2ebaaa)

5 years agotdf#106423: dbase file can have no records
Julien Nabet [Sun, 11 Jun 2017 10:57:31 +0000 (11 12:57 +0200)]
tdf#106423: dbase file can have no records

Regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=4e3ff19b33c84557fd20e68960499933b4e52638
tdf#84834 sc: stricter type detection for dBASE files

Log test file from tdf#84834 still opens in Writer as expected

Change-Id: Ibf5a0f586e3a132455d2363e61e5cc7ea249002d
Reviewed-on: https://gerrit.libreoffice.org/38660
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 57ae8834c8313354477117b65d87c86407f6bf82)
Reviewed-on: https://gerrit.libreoffice.org/38692
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit d2353a5a8afa5aa0a760b0e6412c2f77aa3a6df6)

5 years agoWatermark: fix rotation calculation
Szymon Kłos [Fri, 9 Jun 2017 09:10:28 +0000 (9 11:10 +0200)]
Watermark: fix rotation calculation

* when angle > 180 was used calculated value was 0
* values are rounded

Change-Id: I0cade407883a60d8d802b487668882e95f42ddce
Reviewed-on: https://gerrit.libreoffice.org/38597
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 42353b95629322f51e059337ab06579ffb1c6934)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
5 years agotdf#108494 incorrect Watermark position
Szymon Kłos [Tue, 13 Jun 2017 08:22:58 +0000 (13 10:22 +0200)]
tdf#108494 incorrect Watermark position

Change-Id: Iec1dba66604af008ad8b6b1c20cd508048144463

5 years agotdf#108480: Undo from clone formating does not remove vertical alignment
Tamás Zolnai [Mon, 12 Jun 2017 12:34:59 +0000 (12 14:34 +0200)]
tdf#108480: Undo from clone formating does not remove vertical alignment

In the related change:
d36aa2ba3132ce62a370b7260ca620642cbf7dbf
wrong method was used to set cell properties, which does
not handle undo actions, so use the proper function.

Other issue was related to undo handling of vertical text
alignment in general. In some cases undo actions were lost
after user clicked out of the cell. It is because vertical
alignment is not affecting the outliner and so the related
undo actions were just dropped in EndTextEdit() method.

Reviewed-on: https://gerrit.libreoffice.org/38699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 37d8ac12902506f4185e10f1de4f566dbaf53e42)

Change-Id: I3a6a95fac711056a658a3dee616733939cd13330

5 years agotdf#108305 sw: fix crash on fly "Position and Size"
Michael Stahl [Wed, 7 Jun 2017 15:47:15 +0000 (7 17:47 +0200)]
tdf#108305 sw: fix crash on fly "Position and Size"

Everything else in SwFrameShell::Execute() checks pArgs isn't null so do
the same here.

(regression from d02f75a8c36705924ddd6a5921fe3012fafce812)

Change-Id: I73d85b111a5d2c088b9d888b8595ceb3979e8d2b
(cherry picked from commit 28d760e5220a175a5eb8e859498baa4c7f97f3e2)
Reviewed-on: https://gerrit.libreoffice.org/38521
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit e64a85d50dbd4db7a3de1ee2f6caf52cc60f6a50)

5 years agoFix typo in queryAggregation
Stephan Bergmann [Fri, 9 Jun 2017 17:47:57 +0000 (9 19:47 +0200)]
Fix typo in queryAggregation

...that caused UBSan failure in UITest_calc_demo:

> framework/source/services/desktop.cxx:406:47: runtime error: member call on address 0x611000887c80 which does not point to an object of type 'com::sun::star::lang::XServiceInfo'
> 0x611000887c40: note: object is base class subobject at offset 64 within object of type 'chart::CreationWizardUnoDlg'
>  1a 06 80 29  70 23 e8 c8 5a 7f 00 00  50 87 f0 00 40 60 00 00  48 24 e8 c8 5a 7f 00 00  02 00 00 00
>               ^
>     #0 0x7f5d62c1413b in framework::Desktop::addTerminateListener(com::sun::star::uno::Reference<com::sun::star::frame::XTerminateListener> const&) framework/source/services/desktop.cxx:406:47
>     #1 0x7f5ac78f9337 in chart::CreationWizardUnoDlg::CreationWizardUnoDlg(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx:52:15
>     #2 0x7f5ac7906cdd in com_sun_star_comp_chart2_WizardDialog_get_implementation chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx:368:30
>     #3 0x7f5df087ff37 in std::_Function_handler<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&), com::sun::star::uno::XInterface* (*)(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::_M_invoke(std::_Any_data const&, com::sun::star::uno::XComponentContext*&&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) /usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/functional:1716:9
>     #4 0x7f5df0757dab in std::function<com::sun::star::uno::XInterface* (com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&)>::operator()(com::sun::star::uno::XComponentContext*, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&) const /usr/lib/gcc/x86_64-redhat-linux/6.3.1/../../../../include/c++/6.3.1/functional:2127:14
>     #5 0x7f5df06f69f1 in cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, bool) cppuhelper/source/servicemanager.cxx:667:13
>     #6 0x7f5df07134f2 in cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) cppuhelper/source/servicemanager.cxx:998:17
>     #7 0x7f5df0715d7a in non-virtual thunk to cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) cppuhelper/source/servicemanager.cxx
>     #8 0x7f5d47aca8ca in FuInsertChart::FuInsertChart(ScTabViewShell*, vcl::Window*, ScDrawView*, SdrModel*, SfxRequest&) sc/source/ui/drawfunc/fuins2.cxx:650:27
>     #9 0x7f5d49da003c in ScTabViewShell::ExecDrawIns(SfxRequest&) sc/source/ui/view/tabvwshb.cxx:344:13
>     #10 0x7f5d49ce50ed in SfxStubScTabViewShellExecDrawIns(SfxShell*, SfxRequest&) workdir/SdiTarget/sc/sdi/scslots.hxx:1407:1
>     #11 0x7f5de463ea6d in SfxShell::CallExec(void (*)(SfxShell*, SfxRequest&), SfxRequest&) include/sfx2/shell.hxx:211:35
>     #12 0x7f5de4600cbe in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) sfx2/source/control/dispatch.cxx:377:20
>     #13 0x7f5de4621593 in SfxDispatcher::PostMsgHandler(SfxRequest*) sfx2/source/control/dispatch.cxx:1156:17
>     #14 0x7f5de460487a in SfxDispatcher::LinkStubPostMsgHandler(void*, SfxRequest*) sfx2/source/control/dispatch.cxx:1136:1
>     #15 0x7f5de5f18eda in Link<SfxRequest*, void>::Call(SfxRequest*) const include/tools/link.hxx:84:45
>     #16 0x7f5de5f189d2 in SfxHintPoster::DoEvent_Impl(void*) sfx2/source/notify/hintpost.cxx:44:12
>     #17 0x7f5de5f18861 in SfxHintPoster::LinkStubDoEvent_Impl(void*, void*) sfx2/source/notify/hintpost.cxx:42:1
>     #18 0x7f5dbc3bb9fa in Link<void*, void>::Call(void*) const include/tools/link.hxx:84:45
>     #19 0x7f5dbc3a5bdf in ImplHandleUserEvent(ImplSVEvent*) vcl/source/window/winproc.cxx:1946:30
>     #20 0x7f5dbc39103c in ImplWindowFrameProc(vcl::Window*, SalEvent, void const*) vcl/source/window/winproc.cxx:2495:13
>     #21 0x7f5dbf2f016f in SalFrame::CallCallback(SalEvent, void const*) const vcl/inc/salframe.hxx:276:33
>     #22 0x7f5dbf350db2 in SvpSalInstance::DoYield(bool, bool, unsigned long) vcl/headless/svpinst.cxx:345:31
>     #23 0x7f5dbe714b69 in ImplYield(bool, bool, unsigned long) vcl/source/app/svapp.cxx:494:29
>     #24 0x7f5dbe6efb53 in Application::Yield() vcl/source/app/svapp.cxx:558:5
>     #25 0x7f5dbe6ef896 in Application::Execute() vcl/source/app/svapp.cxx:458:9
>     #26 0x7f5dfab81984 in desktop::Desktop::DoExecute() desktop/source/app/app.cxx:1354:5
>     #27 0x7f5dfab89eb6 in desktop::Desktop::Main() desktop/source/app/app.cxx:1698:17
>     #28 0x7f5dbe76c6ab in ImplSVMain() vcl/source/app/svmain.cxx:192:35
>     #29 0x7f5dbe779bf1 in SVMain() vcl/source/app/svmain.cxx:230:16
>     #30 0x7f5dfadb8659 in soffice_main desktop/source/app/sofficemain.cxx:166:12
>     #31 0x50fa39 in sal_main desktop/source/app/main.c:48:15
>     #32 0x50f9e3 in main desktop/source/app/main.c:47:1
>     #33 0x7f5df9322400 in __libc_start_main /usr/src/debug/glibc-2.24-33-ge9e69e4/csu/../csu/libc-start.c:289
>     #34 0x419f79 in _start (instdir/program/soffice.bin+0x419f79)

Change-Id: I0a798c6d77b7349077ea44dfe112024abb2567f0
(cherry picked from commit 89214e05e0c2f92fbe68e6c4f4a9035a94cff282)
Reviewed-on: https://gerrit.libreoffice.org/38612
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ddba7030fb8ba565bdeef997f87eb491f8ce6a80)

5 years agotdf#37859: Odb data copied to Calc showed wrong encoding in Windows
Julien Nabet [Tue, 30 May 2017 21:50:18 +0000 (30 23:50 +0200)]
tdf#37859: Odb data copied to Calc showed wrong encoding in Windows

Blind fix since I don't have Windows.
If it works, many thanks to:
- Urmas (see https://bugs.documentfoundation.org/show_bug.cgi?id=37859#c16)
- Himajin100000 (see https://bugs.documentfoundation.org/show_bug.cgi?id=37859#c35)

Change-Id: I9fd84977eab8410ec022b6e34f1a636326eaf56a
Reviewed-on: https://gerrit.libreoffice.org/38253
(cherry picked from commit 39487b14956d883899311b6294f6f09ca2371366)
Reviewed-on: https://gerrit.libreoffice.org/38547
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 3951d44110df55589ff80f5eab752817c2475c0d)

5 years agotdf#107795 fixed cursor position after inserting input field
Bernhard Widl [Fri, 12 May 2017 11:55:50 +0000 (12 13:55 +0200)]
tdf#107795 fixed cursor position after inserting input field

Change-Id: I3c063c0393b524132e522914a7a9885c8a9c3b78
Reviewed-on: https://gerrit.libreoffice.org/37536
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 408a7e320db978a8f784fa25e35caedf931612c5)
Reviewed-on: https://gerrit.libreoffice.org/38443
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 48e75d8107d64920dd90c5d98b79dc982e311fa3)

5 years agolibstaroffice: use correct loop index
David Tardon [Tue, 6 Jun 2017 12:12:00 +0000 (6 14:12 +0200)]
libstaroffice: use correct loop index

(cherry picked from commit cc2db25645ede743bdc3824fe7d26ea4beda6a96)
Signed-off-by: David Tardon <dtardon@redhat.com>
Change-Id: I1b862ed2d69c41361bc8c26d96c5329473fe64aa
Reviewed-on: https://gerrit.libreoffice.org/38444
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit f17462390d9ba866f76207839ff996896d0a9af5)

5 years agoofz: fix remaining length check
Caolán McNamara [Fri, 2 Jun 2017 18:22:19 +0000 (2 19:22 +0100)]
ofz: fix remaining length check

Change-Id: I1788ae2a15823b0dc165ad1a99bd0f2aac0bcaf1
Reviewed-on: https://gerrit.libreoffice.org/38363
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e5a25e6b01490cf14dfc6af019fdb0896b19a76d)

5 years agocoverity#1412145 Result is not floating point
Caolán McNamara [Sat, 10 Jun 2017 13:39:29 +0000 (10 14:39 +0100)]
coverity#1412145 Result is not floating point

Change-Id: Ia2b4c4f14f5a59dd5d24c0d0749922e0d190f53a
Reviewed-on: https://gerrit.libreoffice.org/38635
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
5 years agoVML: EMU to Points conversion
Szymon Kłos [Thu, 8 Jun 2017 19:06:11 +0000 (8 21:06 +0200)]
VML: EMU to Points conversion

Change-Id: Icd2dbd6e894975615268dc4aa52d1d53bf9c0bca
Reviewed-on: https://gerrit.libreoffice.org/38581
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
5 years agoWatermark: VML export/import font size
Szymon Kłos [Tue, 30 May 2017 22:03:06 +0000 (31 00:03 +0200)]
Watermark: VML export/import font size

Change-Id: I11409dfc621018a761c70a640938e18ae679d3f5
Reviewed-on: https://gerrit.libreoffice.org/38254
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>