summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-10Bump version to 5.0-24cp-5.0-24Andras Timar
Change-Id: I356b373dd2e9a1bee6a5e953a764435104220d7d
2016-02-10lok: Introduce a "TakeOwnership" filter option for saveAs().Jan Holesovsky
It is consumed by the saveAs() itself, and when provided, the document identity changes to the provided pUrl - meaning that '.uno:ModifiedStatus' is triggered as with the "Save As..." in the UI. This mode must not be used when saving to PNG or PDF. Change-Id: I11b5aa814476a8dcab9eac5202bd052828ebbd96
2016-02-10lok: Interaction handler for saveAs() too.Jan Holesovsky
The LOK does not have to be fully initialized, eg. during the unit tests. Change-Id: I11bb8db37c92b05e2c1ad06e1a6632db7fb0ea60
2016-02-10Revert "lok: Take over the identity of the document when performing saveAs()."Jan Holesovsky
This was not a good idea, breaks the export to pdf or png. This reverts commit 949664deadc04829087af1f6cf4d88b9a2d34114.
2016-02-10tdf#97435: Avoid persistent window state crack when used from LibreOfficeKitTor Lillqvist
Change-Id: Icab7dea3cf63f3932b7759acec339b498a8ac9c5 Reviewed-on: https://gerrit.libreoffice.org/22233 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-02-08Bump version to 5.0-23cp-5.0-23Andras Timar
Change-Id: Iffe1bc40cc9b8fdf3d6990dbc3dcb7fc1a879bb2
2016-02-08lok: Interaction handler for saveAs() too.Jan Holesovsky
Change-Id: I3f0365e05685c21987da194e24a1165c7a3f8b5c
2016-02-08lok: Take over the identity of the document when performing saveAs().Jan Holesovsky
This way we are getting the .uno:ModifiedStatus notification even when performing saveAs(). Change-Id: I370bf483c50161fd4b7f2255ae85fdb76487a9a0
2016-02-08lok: notify the states of undo and redo toolbar itemsHenry Castro
Also included .uno:InsertPage, .uno:DeletePage and .uno:DuplicatePage Change-Id: I91dd2609d6a48be75005a44490614bcf8bcf62e9 Reviewed-on: https://gerrit.libreoffice.org/22195 Reviewed-by: Henry Castro <hcastro@collabora.com> Tested-by: Henry Castro <hcastro@collabora.com>
2016-02-08sw lok: For PgDown/PgUp, don't set the VisArea, instead use a dedicated var.Jan Holesovsky
The m_aVisArea may be changed by many other means (called internally from LibreOffice), so let's introduce a dedicated offset for PgUp / PgDown handling overwriting the computed value (if set). Change-Id: I7c869b1e3582145b58f0185f4df2882d07a81ddf
2016-02-08sw - m_eLastSearchCommand initializationMarco Cecchetti
Change-Id: Iafd72a05a745207dfff7663eeeb7bc697b5b8fd1
2016-02-07CppunitTest_sd_svg_export_tests fails on Windows (compiler/boost issue)Andras Timar
Change-Id: Ife006636295f62a9e35f71ab3b0089dabb0ba623
2016-02-07sw - single search after find all selects the 2nd occurrence - fixedMarco Cecchetti
Now, after a search all action we place the cursor at the beginning of the document so that the single search selects the first matching occurrence in the document instead of the second. Conflicts: sw/inc/view.hxx Change-Id: I8c295bcd316c6197154c68ae97eb424ee6cc9904
2016-02-05lok: Search result should contain info if it is a 'search all' result.cp-5.0-22Jan Holesovsky
Change-Id: Ia3ee81ced4f74c0d029a478bd59eff44d72ef327
2016-02-05Bump version to 5.0-22Andras Timar
Change-Id: I64601731b6f178bf1b6436e326b2064e397a1b02
2016-02-05lok: Notify also about the states of .uno:CharBackgroundExt.Jan Holesovsky
.uno:CharBackgroundExt is supplementary to .uno:BackColor. When .uno:BackColor is set, Writer turns into a 'watercan' mode, where the user directly marks parts of the text with the wanted background color. .uno:CharBackgroundExt then controls this watercan mode - dispatching it toggles the watercan mode on/off, and also the StateChanged events reflect the on/off mode accordingly. Change-Id: I6472eb39129d1b1517fba14bad584cbd125e826a
2016-02-04impress - unable to search inside table - fixedMarco Cecchetti
Conflicts: sd/source/ui/view/Outliner.cxx Change-Id: I07df8d0330390ac599aac364581aee1c9fd0f809
2016-02-04lok: fix saveAs for a loaded HTML documentTomaž Vajngerl
a HTML document is reported as "com.sun.star.text.WebDocument" which is a unsupported document type in LOK so report it as a LOK_DOCTYPE_TEXT instead. Change-Id: Iaa77cb8b1f55cf31ebbb4fd4d69c02702e60e251 (cherry picked from commit 806d34981f480908645038f4cfc29ebcf25ca145)
2016-02-04Allow HTML (WebDocument) to be exported as PNG or JPEGTomaž Vajngerl
(cherry picked from commit 9f84b757a2e6678a30a797e85d8236612b952646) Change-Id: Id6b70a88ea479b402e680c7c216a20be3d6e116e
2016-02-04tdf#91762: Check wether the row and the cell have text...Xisco Fauli
... in order to set the row's min height Regression from 4f2c8194f485b1527fb4f4dfe23ce804937f1f9c After this commit, the row's min height was set based only on the cells containing text in the row, but the problem appeared when the row didn't have any cell with text. Change logic to check wether there's text in the cell and in the row. Now, height in SdImportTest::testRowHeight() is 507 instead of 508 but I can't figure it out why. However, I believe there's no harm in change the test from 508 to 507 as, visually speaking, the difference can't be distinguish. Change-Id: I0b3a14c34eaeaa8e77227860ca290fb79a0302ce Reviewed-on: https://gerrit.libreoffice.org/21692 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit 13d4398820ded5914f635757865e258db2db2b57) Reviewed-on: https://gerrit.libreoffice.org/22009 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 7583d19a58f9aa0fed51c248c1773285e2cb39cf)
2016-02-04tdf#97150: tdf#94924: If we can't handle strings, don't try to thenTor Lillqvist
Fixes the VLOOKUP problem reported in tdf#94540 by falling back to non-OpenCL for such a case, where one of the columns passed to the VLOOKUP contained strings. And since a while, we don't claim to handle strings in VLOOKUP. Which is true. (cherry picked from commit 476bef70f1d9fd58b29a1f6fb95e54567b031acf) Change-Id: I4140c86bf8166beb8201aa90c075d9f4432d9173 Reviewed-on: https://gerrit.libreoffice.org/21874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 6f50edb1aabaf9de37782e63abd109e2276bd0c4)
2016-02-04Resolves: tdf#93151 handle ExpandRefs and mnColDelta the same as mnRowDeltaEike Rathke
(cherry picked from commit 02e69f0c3acec2c2e81692bc53c4356591a84ba5) Conflicts: sc/source/core/tool/token.cxx Change-Id: I8cd00494fc63124443fc01582296ef17f4cd5e27 Reviewed-on: https://gerrit.libreoffice.org/21821 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 406fdc37081a2bdbb4f15f80605f881105c15da0)
2016-02-04Resolves: tdf#97276 don't clip out line if the underlying page size is unknownCaolán McNamara
Change-Id: I77d88d8020e9ac26bd6b7277e6d8afefed5e3ee7 (cherry picked from commit ad99c633908f7c70d06812ebfb4e0696666f0158) (cherry picked from commit 38b362c58abd0df654665956ffc751d40cfb67ab) Reviewed-on: https://gerrit.libreoffice.org/21814 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5f9a61e877d79cce1f99c05a9c1598a029bf2c1c)
2016-02-04Resolves: tdf#97375 use Invalidate in all modesCaolán McNamara
makes the crash/hangs go away (cherry picked from commit ab5c427784fb72d52042b8122ffc5a0fd7108c6b) (cherry picked from commit c3f09ae629b349c52a4a7954e3017ceb8d7afeaf) Change-Id: I91a4391190ec7aa0ffa5e41a8c1eb86b4bb9c484 Reviewed-on: https://gerrit.libreoffice.org/22026 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 1b49e14c82af691fe1ec5aa5de8392350bce11a1)
2016-02-04xmloff: tdf#96147: ODF export: fix duplicate fo:background-colorMichael Stahl
... attributes that happen if both CharHighlight and CharBackColor properties are used, because the CharBackTransparent property wasn't taken into account, and combining the CharBackColor and CharBackTransparent properties happens *after* XMLTextExportPropertySetMapper::ContextFilter() runs. Also, it looks like a transparent highlight wouldn't export properly but apparently DomainMapper::getColorFromId() won't create such. (regression from f880962f5bf26bfaef06bd3f9e67e2d901a2e74c) (cherry picked from commit 8dadefc35f8b33648fb6adbdaca75ea52b2705db) Change-Id: Ib628ef8bb377482f74fadb97c81afb95fbbf7184 Reviewed-on: https://gerrit.libreoffice.org/22046 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e92dcab1407fa26fc5ee68d0b626b87bc04f1b3b)
2016-02-03Resolves: tdf#96653 distorted images on export to pdfCaolán McNamara
regression from: commit ffe150ce903d9cdc62c25ad3437e61d24ede17d6 Date: Fri Dec 4 18:19:08 2015 +0100 tdf#94739 use GetScanlineSize instead of calculating it which was on the right track in the sense that the original code was wrong and only worked for <= 8 bit depth images Change-Id: Iee54a9f29dd0fdaf3e1f2aeb7b9898cecb453e37 (cherry picked from commit 384c815eda697d75706f686dc2ceb227b4d3f245)
2016-02-03Bump version to 5.0-21cp-5.0-21Andras Timar
Change-Id: I2f1f6a61661faad76a9929ffc64125ffbd09ec6a
2016-02-03libreofficekit: CppunitTest_libreofficekit_tiledrendering crashesMichael Stahl
Need to check that a callback was actually set before calling it. Change-Id: Icb2ca19aec0c74f6695d7286f046dadfe609d68c
2016-02-03lok: Avoid the 'alien format' warning in LibreOfficeKit.Jan Holesovsky
We immediately cancel all the dialogs that potentially come up when using LibreOfficeKit; which means that when you tried to save a .docx to a remote server (which triggered the 'alien format' warning), the save operation couldn't be completed. Change-Id: I6bb5eadac994c1f515d7a49299c21960b3491bbe
2016-02-03lok interaction handler: Add handling of io and network errors.Jan Holesovsky
Change-Id: If7c84a7b24f2072439718fb0c473b73243f2ecc1
2016-02-03lok interaction handler: Move password handling to an own method.Jan Holesovsky
Change-Id: I1b3cfdef5f4f81c9138ad5600e43755841df5d75
2016-02-02tdf#96308 RTF import: fix tab stop inheritance inside table cellsMiklos Vajna
The tab stop list is a paragraph property, and RTF requires to repeat it after \s as direct formatting, otherwise the parser should be assumed that the tab stop list is cleared as a direct formatting. Non-buffered text handles that in getDefaultSPRM(), handle it directly in the RTF_PARD code for buffered text. (cherry picked from commit 1ec88cdb82a28851c4b97d7f043d8bcec3c675e8) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I16b09bc4c177df5a74d16653b829b198aa1a800f Reviewed-on: https://gerrit.libreoffice.org/21996 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 cb64c29389939048666141eb4dddcfae4dd70ee5)
2016-02-02tdf#96075 Frame alignment buttons not using correct tooltipsSamuel Mehrbrodt
Tooltips change on state change, and they were taken from another source. Unify this to reuse the existing strings from the uno command. Change-Id: I8ff6fc43bc0469f15c9e930695d950f6d664bfdf Reviewed-on: https://gerrit.libreoffice.org/20629 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-on: https://gerrit.libreoffice.org/20633 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit acfc9935a41d45619d09d05abe6d933c3cd9fcc7)
2016-02-02tdf#93637 TAB_OVER_MARGIN support for a few more casesJustin Luth
Extending nMaxRight when TAB_OVER_MARGIN compatibility is set and the right tabstop goes beyond the right margin fixes PDF output as well as certain cases of screen display. Reviewed-on: https://gerrit.libreoffice.org/19635 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit d1bd4465be649a4078c3a2f85a64c8a6300dd65d) Reviewed-on: https://gerrit.libreoffice.org/21561 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 8c564a1fd313da29088bed6453c5e16876690d24) Change-Id: Ida4b4f399f06670d9bdefdc21978adf19a81d53a Reviewed-on: https://gerrit.libreoffice.org/21694 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 7b644045bebcd70e7324beac793b5018da1c4de5)
2016-02-02Quickfix for Win 64-bit C++ UNO bridge (more than 20 params)Stephan Bergmann
See <https://wiki.documentfoundation.org/Development/msvc-x86_64#Broken_C.2B.2B-UNO_Bridge>, increase the number of supported params to 32 to at least make the ooo.vba.excel.XApplication.Intersect case (and thus CppunitTest_sc_macros_test) work. The true fix will be to abandon this simplistic approach, as elegant as it may have appeared. Change-Id: Ieeb17f682bd5ea8cb7a6188b89978698949461aa (cherry picked from commit ef99aad5868b308e1a421c3eaa8221f8f78d80d5) Reviewed-on: https://gerrit.libreoffice.org/21834 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b7937f1caf86cb68ba8d9b04fb4069934a754cf1)
2016-02-02Resolves: rhbz#1257635 after httpConnectEncrypt use cupsGetDests2Caolán McNamara
sometimes after calling httpConnectEncrypt + httpClose and then calling cupsGetDests we get no printers found. Using cupsGetDests2 with the return of httpConnectEncrypt consistently provides results. Change-Id: I7ea5b11fbaabbd7ca73e5c94d0757ebdea8445ad (cherry picked from commit 6b86edae5c1eee51ee754b8013d463497bb75f65) Reviewed-on: https://gerrit.libreoffice.org/21716 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 41e96311290a85f190dc4838de6a9bc24fa96e9a)
2016-02-02update creditsChristian Lohmaier
Change-Id: Id5647e0d72a5560c7bc0c75fd7a06a1897ca4071 (cherry picked from commit 446eb095354124406063b6467d1886b8647dc211) (cherry picked from commit de8b2cfbcec31077b09adb2b2856d1185d1559e9)
2016-02-02Resolves: tdf#97331 use VclPtr instead of pointers to avoid crashCaolán McNamara
(cherry picked from commit 5d29ed1801a07d4649e095c25935b50f5ad32eb4) (cherry picked from commit 53e693ccfb19aa653ab2b5762c10ae87c9320954) Change-Id: Ia653a67046cb2cfb7c96367a7483ddc0cb29819e Reviewed-on: https://gerrit.libreoffice.org/21810 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 72c2f90a42dad97cf9bc1a20c15f9946348fe01b)
2016-02-02oox: coverity#1348468 copy-paste errorMichael Stahl
Change-Id: Ibea6944c4e61e9848aac936e399ed08192ec5812 (cherry picked from commit 99ab23d26010120e7e6344cb2b26e192890ec5c3) Reviewed-on: https://gerrit.libreoffice.org/21489 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 436b1615b271bae46a43530c2dab3a80b4e46419)
2016-02-02xmloff: there is no reason why office:version should be omittedMichael Stahl
... if a document contains foreign elements or attributes. In fact since ODF 1.2 the office:version attribute is mandatory and any document that omits it is therefore invalid, while "extended conforming" documents are allowed to contain foreign elements and attributes. This mysterious check was there since CVS initial import, but without any justification. (cherry picked from commit d277ac87455a599fbf4acd3c6401f09bc74d3dac) Change-Id: Ifeafad2b7af41f06356461adb7ae65dbf7bae11d Reviewed-on: https://gerrit.libreoffice.org/21475 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 32a25a623347c038ec75c3c594d615419c4da7fc)
2016-02-02tdf#95213 DOCX import: don't reuse list label stylesMiklos Vajna
We used to optimize the creation of these styles, so in case two list label had the same character properties, then we could avoid creating two styles for those. This isn't correct though: it means if the style is changed later by the user, then unexpected other places in the document will change as well. Do what the binary DOC filter does: create one character style for each level of a numbering separately. (cherry picked from commit f9c8d97d82a85b897520a2fe897352ee5ad879d9) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/NumberingManager.cxx Change-Id: I967b30fc078b1be30f7ef81b2706df2962fc3fb0 Reviewed-on: https://gerrit.libreoffice.org/21437 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit af55185eb9ffcf903bba22cad736797162a7eb4d)
2016-02-02tdf#96910 : Calc crashes while using "Insert Column Left" for large DocumentsYogesh
Change-Id: I6e813b7525a3d9b1db131db9f08fc20f7320345f Reviewed-on: https://gerrit.libreoffice.org/21661 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 208883398dcf9af6b88611097d1f75d5fbc9afad) Reviewed-on: https://gerrit.libreoffice.org/21792 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 10f3272bb1bf36cae5eb6e80f9f1e0f4753ebb5d)
2016-02-02tdf#97308: fix logic with conditional "ends with"Julien Nabet
Change-Id: Ib9f9ed627dc37b11d8c3911aa4fe62141ff471c2 Reviewed-on: https://gerrit.libreoffice.org/21723 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit a0a4ea3c636fc18cca6a3b2f9391996fb909e81f) Reviewed-on: https://gerrit.libreoffice.org/21731 Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 9cd87519d7a9d97b58fafff25280bd77fe04ab25)
2016-02-02valgrind: memleak on thrown exceptionCaolán McNamara
(cherry picked from commit f5aefab2a62a90c631e05ec29022a2f7e19f00c3) Change-Id: I2788c5fe04a984d6534adbd3186cc652685152e8 Reviewed-on: https://gerrit.libreoffice.org/21737 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 636d45438f317d7ef39d660c11f6bab1dc42302a)
2016-02-02valgrind: memleak on thrown exceptionCaolán McNamara
(cherry picked from commit 15b1080e624447ca1af1396023bb1fbfdb44fb26) Change-Id: If562dc69290021f898feff9f8e3983b867075172 Reviewed-on: https://gerrit.libreoffice.org/21736 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 85918431993fe3637145cca62b133c0c21cb5430)
2016-02-02Add build toolchain to upload LibreOffice API to Maven CentralDavid Ostrovsky
Set up the toolchain to create sources and javadocs artifacts in addition to JARs created during the build. Use Buck build tool for that: [1]. This is a fork of Google's build tool Blaze, created by Xooglers at Facebook. This build tool (like Blaze itself) uses Python to write build files. Add needed tools and build files to install LibreOffice API artifacts to local Maven repository or deploy them to Maven Central. To build all needed artifacts LibreOffice must be built regularly with GNU make first. To build the rest of the API (sources and javadocs): $> buck build api To replace version number with upcoming release version: $> solenv/bin/version.py 5.1.0 To install the API to local Maven repository: $> buck build api_install To deploy the API to Maven Central: $> buck build api_deploy Detailed documentation is added to document the prerequisites and the workflow to upload LibreOffice API to Maven Central. * [1] https://buckbuild.com Change-Id: Ibdd552a01110836703bc069abe829b9921491cac Reviewed-on: https://gerrit.libreoffice.org/20343 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 1fd41f43eb73c373cb94d32d82c5fb7a7e243367) Reviewed-on: https://gerrit.libreoffice.org/20814 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 95fe7d0a68c230df13c80dd8759f86d635c48101)
2016-02-02Fix wrong use of OUString::copyMaxim Monastirsky
Code like: if( aCommandURL.copy(5) != ".uno:" ) is obviously wrong, as OUString::copy(sal_Int32) takes the _beginning_ index, so for this condition to be false the command URL must have ".uno:" in the _middle_ of the string. This created some weird things like an empty label attribute added to any submenu item. Moreover, the command URL can be easily shorter than 5 (like when a custom submenu added by the user). Using copy(5) in such case officially considered as "undefined behavior" and will trigger an assert in debug build (that's how I discovered this code actually). Most likely the original intent was to check whether the command URL doesn't start with ".uno:", and so should be changed to use OUString::startsWith. But doing that will create a regression, as it won't be possible anymore to change labels of commands that start with ".uno:". Simply dropping this check seems to be better solution here. (cherry picked from commit 0dbe3d40579d20f4cbce3ce155996ff4b5c32c99) Conflicts: framework/source/fwe/xml/menudocumenthandler.cxx Change-Id: I2f88807eceae1006066a14750f2003e235f49ad4 Reviewed-on: https://gerrit.libreoffice.org/21705 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 23d363f019e8c6911adb5f8b07bdb7ff09d467cc)
2016-02-02Related: rhbz#1149116 collateEquals was set with OString::booleanCaolán McNamara
but extracted with toInt32() since commit c76cd71fe9bdefaef3f33f8ca193c32e3ab112ed fdo#41524: CUPS printing: use "collate" option when PDF is available though actual reported problem works fine for me with default f23 configuration already, this looks suspicious however Change-Id: I6fcb5df8039296c0e8b0fe931cb490396182de38 Reviewed-on: https://gerrit.libreoffice.org/21629 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e220ba8610f8315af473a230565daa978ca6a16c) Reviewed-on: https://gerrit.libreoffice.org/21631 (cherry picked from commit 01c60a8452bf991bb5e09e9780d05a8376979255)
2016-02-02update creditsChristian Lohmaier
Change-Id: Ib620fe26481bf13021930ae58f7421b9cb7bdb4b (cherry picked from commit 00c523c0daac1934e300775ea370003e84da1971) (cherry picked from commit 0465c9517302fa71629265f2c82e3fc639e182f7)
2016-02-02tdf#96480: ODF import: eliminate duplicate cross reference heading bookmarksMichael Stahl
7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c is apparently worse than it appeared at first glance since there are numerous assumptions about bookmarks, such as that if they were inserted successfully they may be copied successfully, which isn't the case for duplicate cross reference bookmarks. So fix this differently, by eliminating the duplicates and mapping all reference fields to refer to the surviving bookmark. It was not possible to do this in SwXBookmark by checking the makeMark() return as that would raise interesting problems such as it's currently guaranteed to have 1:1 SwXBoomarks to core Marks so we can't just connect 2 SwXBookmarks to the same core Mark, and we also can't leave the SwXBookmark unconnected after attach. Another alternative would be to temporarily allow inserting the duplicate bookmarks and then eliminate them after the import, but what is implemented now is to check from xmloff for duplicates, which is reasonably simple. (cherry picked from commit 774fb6d2e7cf36b677e66c54278225b1256bd40f) Change-Id: I7ee4854d1c9d8bf74201089cbb7287b1bd8ee3b9 Reviewed-on: https://gerrit.libreoffice.org/21369 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 55d2301ac658167396bf5533c940bceffff67f04)
generated by cgit (git 2.34.1) at 2024-06-17 14:32:26 +0000