summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-07-19Bump version to 5.3-21.cd-5.3-21Jan Holesovsky1-1/+1
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
2017-07-19sd pptm: Preserve the VBA stream on export.Jan Holesovsky3-12/+63
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
2017-07-19lok: Add docm/xlsm/pptm filters to be known by LOK.Jan Holesovsky1-0/+3
Change-Id: I4995498132b832ce783efc9740f1d7129f085a01
2017-07-19sd pptm: Add a separate PPTM filter.Jan Holesovsky11-61/+108
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
2017-07-19comphelper: Allow initializer lists for Sequences of NamedValues.Jan Holesovsky1-0/+19
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
2017-07-07CPLinux-MPL.confAndras Timar1-0/+52
Change-Id: I35c364f207d0e3d8b2d029ec0456b2abc45841a1
2017-07-07tdf#107505: Impress - crash with two people co-editing one slideTamás Zolnai1-0/+1
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>
2017-07-07tdf#108995: take xml:space attribute into accountMike Kaganski4-2/+53
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>
2017-07-07tdf#108714: Also support paragraph-level (line) breaksMike Kaganski5-6/+13
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>
2017-07-06Bump version to 5.3-19Andras Timar1-1/+1
Change-Id: I4dd1be6ba50cbbba200db53e79f2eb502943ab14
2017-07-06tdf#108873 fix merge data handling in fieldsJan-Marek Glogowski3-3/+21
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)
2017-07-06Set error on more than max params (255) per functionEike Rathke2-2/+7
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)
2017-07-06tdf#107976 sw: let a view handle multiple transferablesMiklos Vajna3-10/+31
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
2017-07-06tdf#101821 sw: layout: don't move endnotes into footnotes' containerMichael Stahl1-1/+2
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)
2017-07-06handle SID_ENCRYPTIONDATA for shared password protected docs, tdf#56173Markus Mohrhard1-0/+7
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)
2017-07-06always import page scaling, tdf#65848Markus Mohrhard1-1/+1
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)
2017-07-06Resolves: tdf#108671 mark named expression single reference #REF! if deletedEike Rathke1-0/+59
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)
2017-07-06Resolves: tdf#107959 SdrGrafObj leak triggers later crashCaolán McNamara1-10/+7
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)
2017-07-06Don't let m_nGrabLevel become negative, tdf#108705 relatedEike Rathke1-3/+6
... 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)
2017-07-06tdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implementedMichael Stahl1-1/+4
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)
2017-07-05Fix a bit obscure pointer checkMarco Cecchetti1-10/+10
Change-Id: Ib5276bacfb1b4e429960d93ddccdf63f61db6f03 Reviewed-on: https://gerrit.libreoffice.org/39574 Reviewed-by: Marco Cecchetti <mrcekets@gmail.com> Tested-by: Marco Cecchetti <mrcekets@gmail.com>
2017-07-05sc lok: disable items of the overlay managerHenry Castro1-12/+12
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>
2017-07-05support for saving a modified image instead of original versionMarco Cecchetti11-20/+130
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>
2017-07-03tdf#108622: use correct type for last check timestamp during autocorrectAron Budea2-2/+2
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
2017-07-03fix crash on windows with nullptr in operator<<Markus Mohrhard2-0/+13
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
2017-07-03pBASM can be nullptr in copy docs, e.g. during insert sheet from docMarkus Mohrhard1-0/+3
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
2017-06-28Bump version to 5.3-18cp-5.3-18Andras Timar1-1/+1
Change-Id: I2a46962eab6ca8ab5170437fad5b19c7377bcaf8
2017-06-28Watermark: tdf#91687 correct size in the .docSzymon Kłos6-6/+56
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>
2017-06-28tdf#108714 follow-up: handle deferred break in character groupMike Kaganski3-8/+19
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>
2017-06-27tdf#108806: convert CRLF into space in OOXML textMike Kaganski3-2/+16
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>
2017-06-27tdf#108714: allow <w:br> as direct child of <w:body>Mike Kaganski8-1/+100
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>
2017-06-27Resolves: tdf#108643 don't restore orig size on first chart activateCaolán McNamara1-1/+3
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>
2017-06-27Resolves: tdf#108419 use spinfield preferred size as transparency widget sizeCaolán McNamara1-5/+2
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)
2017-06-27ofz#2392 restored props don't match saved propsCaolán McNamara1-2/+13
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)
2017-06-27tdf#108732 ListBox: in absence of a field, treat data as stringLionel Elie Mamane1-1/+3
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)
2017-06-27Resolves: tdf#108475 swipe only if some reasonable movement was involvedCaolán McNamara1-1/+3
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)
2017-06-27tdf#40713: dBASE, don't lose dbt fileJulien Nabet1-0/+6
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)
2017-06-27tdf#55631: DBASE import (take 2)Julien Nabet1-0/+5
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)
2017-06-27Resolves: tdf#108292 WalkAndMatchElements: really limit the matchEike Rathke1-4/+9
... 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)
2017-06-27tdf#93968 bullet char style preview is unreadable, cause uses opensymbolCaolán McNamara1-0/+2
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)
2017-06-27Resolves: tdf#108705 remove grabs on widget before destroying itCaolán McNamara1-0/+5
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)
2017-06-27tdf#101821 sw: fix layout footnote use-after-free in SwRootFrameMichael Stahl1-10/+14
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)
2017-06-27ofz: use our own OString insteadCaolán McNamara5-16/+18
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)
2017-06-27Resolves: rhbz#1454693 segv if tiled rendering is interruptedCaolán McNamara1-2/+21
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)
2017-06-27tdf#107684 DOCX export: fix duplicated <w:outlineLvl> element for stylesMiklos Vajna3-2/+9
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
2017-06-27Resolves: tdf#107438 write <text:sender-initials> for fieldsEike Rathke1-17/+4
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)
2017-06-27ofz#2287 check multiplyCaolán McNamara1-1/+9
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)
2017-06-27ofz#2332 fix dangling pCObjCaolán McNamara1-0/+2
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)
2017-06-26tdf#89139: pivotCache: output sharedItems children only for string fieldsMike Kaganski1-37/+65
... 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>
2017-06-26tdf#89139: dump pivotField itemsMike Kaganski1-5/+97
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>