summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-01-31Adapt o3tl::span to P1872R0Stephan Bergmann5-10/+33
..."span should have size_type, not index_type" (<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1872r0.pdf>), as implemented by libc++ since <https://github.com/llvm/llvm-project/commit/ 1466335cf4b2854a0be1defcf279fe50772bad6f> "[libc++][P1872] span should have size_type, not index_type." All uses of index_type had been added to mitigate the previous std::span change from signed (ptrdiff_t) to unsigned (size_t) index_type, see 6ef8420fdbf8dff16de13147c5ab833bc5e01121 "Adapt o3tl::span to updated C++2a std::span". There is no easy solution to transparently support all three std::span variants currently out there (signed index_type, unsigned index_type, unsigned size_type), without causing compilation failures due to CPPUNIT_ASSERT_EQUAL with arguments of different types, or compiler warnings about mixed signed/unsigned comparisons. So rule out the oldest std::span variant (signed index_type) in configure.ac (so that o3tl::span will use its own hand-rolled code in that case) and simplify the uses of index_type to std::size_t (as had already been mentioned in 6ef8420fdbf8dff16de13147c5ab833bc5e01121). Change-Id: I6ddf424ffb7941da3f69ad66fd29ecd35f09afae Reviewed-on: https://gerrit.libreoffice.org/84652 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 8e6865188242bccb3d8aa857ddc990d72a058d3d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87757 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-30Update git submodulesMike Kaganski1-0/+0
* Update helpcontent2 from branch 'libreoffice-6-4' to f1cb84713664fefd3892671808efe31234e11eec - tdf#127566: don't change divcopyable border width in onclick handler Instead, define border width in respective CSS, to make it consistent in both clicked and non-clicked states, and avoid "jumping" on click. Change-Id: Ic8ab8d0fd586059e21de6aa866fef95226774acf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87718 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 35281f4c9178f373609a61f0a44e268b179c5749) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87756 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-30tdf#129237: Add unittestXisco Fauli2-0/+43
Change-Id: Ica8942e6f165afad1ed40457ec86bd20713a1a59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87744 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 029d1e92945eb6ac8cd31911f35bed92a4201897) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87747
2020-01-30tdf#130286: jsdialogs: fix CID 1455691 & CID 1455690Szymon Kłos1-8/+11
Change-Id: Idbb3e70c1a09be7dd7c43747250f3a6368251cd9 Reviewed-on: https://gerrit.libreoffice.org/82662 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 77cc0e929ee331af6b97b65e9b6ec5400ef05cd4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87733 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-30Adapt to C++20 deleted ostream << for sal_Unicode (aka char16_t)Stephan Bergmann2-2/+2
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1423r3.html> "char8_t backward compatibility remediation", as implemented now by <https://gcc.gnu.org/ git/?p=gcc.git;a=commit;h=0c5b35933e5b150df0ab487efb2f11ef5685f713> "libstdc++: P1423R3 char8_t remediation (2/4)" for -std=c++2a, deletes operator << overloads that would print an integer rather than a (presumably expected) character. But in these cases printing an integer is as expected, so add explicit casts. Change-Id: I7c2f1afaa2982b284aef8af183b71466c37142c2 Reviewed-on: https://gerrit.libreoffice.org/84339 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e8cb5f2e11838060f85e7940540b5f7096d9eeb7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87745 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-30tdf#129237 just add content checks for Input fieldsJan-Marek Glogowski1-9/+15
There seems to be fields with content values, which don't use it as the presentation value. So this reverts the content handling code back to the original one and just checks the content value from Input fields in addition to the SetExpression fields. Change-Id: I2abd227883035c559b1fc3f7aacf10769b0e79a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87093 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 3a248dfe57318af57fc5df89652cb64dfa923e46) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87740 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-30tdf#129659 DOCX check global footnote contextJan-Marek Glogowski3-8/+12
Since tdf#121441 we parse custom footnotes to get at least the DOCX footnote text, even if we can't represent the formating. This might push additional contexts to the parser stack. Therefore it's now not sufficient to check the current context for a footnote, but one has to check the global parser for a footnote context. The actual bug is the unsupported footnote page break, which was not correctly ignored and added a paragraph context to the stack, resulting in the async substream input and output stack size. Change-Id: I143254e7df37a619cb4efb542b58d3eff3afffa7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87114 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit b87af9775167002d36a3bc16cb308ea7895d7ea0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87742 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-30tdf#129625 Calc Navigator: Gray out content types with no contentJim Raykowski1-0/+12
Change-Id: I298894bbb338b97fe6891e33b23f16302acaec37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87714 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 54d96a88d2623b4ffcc00f4b8a8479edab5fbb6f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87741 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-30tdf#129993 broken tables opening LWP fileNoel Grandin6-80/+80
regression from commit e2080e70fe8b085f18e868e46340454720fa94ca new compilerplugin returnbyref The parts that fix this specific bug are in lwprowlayout.cxx and lwprowlayout.cxx, but fix the other parts I messed up but not understanding the semantics of assigning to reference variables. Change-Id: I064cdd108c5b05da6092da0297dc7bcf487c7702 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87686 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 0b113d6ebbaf923e11ba576bed2691bb68e95ae6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87717
2020-01-29tdf#129625 Gray out content types with no contentJim Raykowski1-0/+5
This patch is for Writer Navigator only. Change-Id: I80724a3e24fd38d7b5537e1c923866a914b45898 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87668 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 000ba228db56c28b6e2a42bf6adefe6ca6cfdffb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87669 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-29Resolves: tdf#130130 Insert menu, multiple hotkey never reaches 3rd itemCaolán McNamara1-6/+30
Change-Id: Ica70be71094229a12c16eee1d3ff6960b7e06734 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87665 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-29Resolves: tdf#130164 background/border dialog should be modalCaolán McNamara1-1/+5
Change-Id: I763cc054b23d4f72e1dec175861f3062d6bda6fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87346 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-29tdf#130179 sw comments on frames: limit insert UI for at-char and ...Miklos Vajna5-1/+167
... as-char anchor types SwWrtShell::InsertPostIt() only sets the comment anchor for those types, and we would crash without an anchor. (cherry picked from commit d05a65bec5dc498f66f9331189124d539bc0d505) Conflicts: sw/Module_sw.mk Change-Id: I7d2f5d3d8f8e11c46db060c17587e97ecb786ad2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87586 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-28tdf#130214: workaround invalid state resulting from error on importMike Kaganski3-0/+11
Obviously the real error is somewhere else, which results in tdf#126435, and produces unexpected state with missing text append context on stack. This is just a hack to avoid crash. Change-Id: I420ac3b74f5efb9688dc764ac2ad0dcc974ba0e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87595 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit eca00082c78fddf79f247057227404738be8806c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87634 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-28Sifr: Update Gamma icons in Sidebar and Tabbed barrizmut2-14/+10
Change-Id: Ica1446b534678da40064c1e7ab04d667c2b536db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87630 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-01-28tdf#127112 repair "sticky" levels in Customize numbering style dialogSeth Chaiklin2-5/+27
Change-Id: Ifa841e7b63b28d6e0f84f5cd6b1800481b36425b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87645 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-28Breeze Dark: Fix for invisible icons (tdf#130205)rizmut96-48/+48
Change-Id: Id2d7496cc34d538611bb5285009530be797e6a5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87613 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> (cherry picked from commit 77ce7835e7e46290d8d3204cfa2e6d1ad39a0ee4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87640 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-28elementary: Move wrong placed icons, delete unnessary iconsrizmut9-3/+313
Change-Id: Iead17a1815f502f88994bf21570e4c0db938c258 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87620 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> (cherry picked from commit 45dd6e5c23d7f826bd9b9db4bd8b12c864efa9e0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87647 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-28Resolves: tdf#130239 set an explicit parent for the message dialogCaolán McNamara1-1/+2
Change-Id: If6e4bdf674f1aaaaaa5ceaa7cda5715af1aa7ce6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87611 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-28fix bug in testTdf128304Noel Grandin1-3/+3
Assuming the test actually meant to use these vars Comes from commit b203b9c83d0000c8465dcd92fb6b029a2f28c724 Date: Fri Dec 13 07:23:35 2019 +0800 tdf#128304 export TB_RL writing mode as eaVirt Change-Id: I0649f189019ea764e7ed554dac43932b717eed2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87535 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 44a520fe7ffd8bca45babdf325ec307c30c1a006) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87585 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-28tdf#103983 VML import: handle <v:textbox style="mso-fit-shape-to-text:t">Miklos Vajna2-2/+6
We used to always always set TextAutoGrowHeight to true, only do that when the matching VML attribute is detected, default to false. This helps the exporter, so it writes the correct markup on save of the bugdoc. Also adapt testGroupshapeChildRotation, which in practice tested the automatic height of the shape. The point of "auto" is that it changes as needed, hardcoding that value in a test is not a great idea. Rather test that the height is no longer automatic (there is no explicit markup in the file, and the default is false). (cherry picked from commit b92293b3943423324064a8513c2e114d18817179) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ie39408b7da53f4923a2ade503e520c704a86bcf4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87120 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-28tdf#130155 Writer Navigator crash fix: Check entry to expand has childrenJim Raykowski1-1/+5
Fixes crash/freeze when an entry without children is sent is to SwContentTree::Expand. It forwards to SvTreeListBox::Expand deal with it. Change-Id: Icd3cd1b2d0a949e01a3e02a6fa4cdc08610c8ffb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87307 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit a46e768810e82abaf98e5cef02c697c718877974) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87504 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-27Update git submodulesOlivier Hallot1-0/+0
* Update helpcontent2 from branch 'libreoffice-6-4' to 486a99d885e299b5e0b4396bcbf39458b36ac03f - Update New Features video for Release 6.4 Note: This patch has *no* impact on string freeze and is valid only for the online version. Change-Id: I2c88b6503f6a7a6a98b83d07124a7b1027f827c5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87532 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-27Resolves: tdf#130143 crash in sorted font replacement tableCaolán McNamara2-23/+19
it was always sorted historically, just without showing the sort indicator. Fix that inconsistency which led to the error causing the crash, and use iterators when appending to the sorted list instead of indexes which is the crashing part. Change-Id: I4ea3028a334129bdeb8e1a1aa79f4ead8a0243e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87344 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-26tdf#126459: Consider translated origin of the view also on resizeKatarina Behrens1-2/+7
use-case is the presenter console on 2nd screen, media shape must be placed relative to the window w/ slide preview, not relative to the main window Change-Id: I120f86e399563d2aafc31d88d0a7f9d357f4840c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87135 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit d4561921dde7d350b3b4d5f793871bea8ba4546d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87258 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-24Resolves: tdf#129158 freeze/thaw around bulk insertsCaolán McNamara1-3/+10
Change-Id: I0ba22cd262512b467abd383d2f932d2adf6ca1a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87257 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-24tdf#128782: Add UItestXisco Fauli2-0/+45
Change-Id: I389d05fa9b1e79af2c01abd920fb4454b96543fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87282 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit e13f74ba563e1c82a1de587818f6090077c6f30f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87303
2020-01-24tdf#128046: preserve list levels on pasteKatarina Behrens3-7/+18
done in two steps: 1) bullet and numbering properties must be included in the property list of SvxUnoText on import from ODF clipboard (SvxReadXML) 2) in ConnectParagraphs, don't merge para attributes if the paragraph to be deleted is empty. Paragraph breaks are inserted before paste so this would make the last list level of the pasted text take the properties of the empty paragraph and thus lose its indentation Also updated tdf#103083 unit test to be more specific and test that bullet properties don't get lost after paste. Previously only count of SfxItems was tested which is somehow fragile and fails bc paste adds a paragraph style Change-Id: Ia162adb7abf145a8217f21c7ebfe06b69731e2a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86983 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 66ed51712bb323bba7d1a0b0d21b256e5f5f9ccf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87284 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-23tdf#130133: fix wrong values for attribute chart:regression-type in ODF 1.2Julien Nabet1-2/+4
"polynomial" and "moving-average" Change-Id: I5d07d0315555e8b72ea721a35a2205a8223ed294 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87226 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 84c2b1ab7a8cf5d7f568ef05d4b2b25e783382b6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87253 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-23sw_redlinehide: fix SwScriptInfo hidden textMichael Stahl1-0/+1
A missing update of nOffset in SwScriptInfo::InitScriptInfo(); it must be updated for every extent but it's not for the last one in a node. test case: ab cd Delete "bc", hide "d", but "a" disappears. (regression from 0e26d48ad7f18deac8447a306215f79d5c62be27) Change-Id: I99fb88409e184a61866f908722b4430a53914153 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87201 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 53cd5d1f50d3da4efe0938aa340f6a57a0b8501d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87246 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-23Related tdf#126459: fix crash in presenter console using gen vclplugKatarina Behrens3-1/+5
A slide with video is needed to reproduce Regression from commit ac87cfdf263d2abd97b32857534d0f749b7c4479, 'toolkit' and 'platform' bits were never set (bc irrelevant) in gen vclplug but now if not set, values mapping to 0 (Gtk3, Wayland) will be used and things go down the drain in avmedia/gstplayer then Just between us girls, nobody in their right mind would use gen vclplug for presentation, but crash is not nice so let's fix this Change-Id: If318ab93897f9f4854f7316e630c35aaec2480fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87185 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 13bc1ec30c5adf05ff987c25634b845bab7bc4ae) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87237 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-23tdf#129382: sw: assign names to shape object stylesVasily Melenchuk2-2/+2
Empty style names for drawing object will cause problems with udo/redo which right now refers style names instead of style pointers. Change-Id: If2266f1db04c624dbfdd716b5599d5f6cbb5371e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86520 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit db8fdf20fbbb22e0510f0500140bbf7a3b2642f7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87214 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-22Breeze & Sifr: tdf#128849 & Sifr: tdf#129846rizmut13846-1108/+16153
- Breeze & Sifr: Add SVG variant of dark version - Sifr: Add more 32px icons Change-Id: I8ce5ff12b1178d215d4ca756a512ff01754fbff9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87188 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-01-22Adapt SAL_WARN to C++20 deleted ostream << for sal_Unicode (aka char16_t)Stephan Bergmann2-3/+3
<http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/p1423r3.html> "char8_t backward compatibility remediation", as implemented now by <https://gcc.gnu.org/ git/?p=gcc.git;a=commit;h=0c5b35933e5b150df0ab487efb2f11ef5685f713> "libstdc++: P1423R3 char8_t remediation (2/4)" for -std=c++2a, deletes operator << overloads that would print an integer rather than a (presumably expected) character. Change-Id: Ic70d3e90e4b990d297e35f07379fe4952e138820 Reviewed-on: https://gerrit.libreoffice.org/84321 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b8bb7fd853db5d0d7cc4ea9120efb1a707e46c22) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87211 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-22tdf#128782: sw: assign name to draw objectVasily Melenchuk1-1/+5
SwXDrawPage is inserting frame styles without name. This is confusing undo/redo code which is operating styles by names. Change-Id: Ibcda01fbd3ec88e9cdbde446c3f18c7ad6b0cbc8 Reviewed-on: https://gerrit.libreoffice.org/83415 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit c2d689790c332ffd2f0d73de6aae53f26f0fbe53) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87206 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-22Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-4' to fe8d189dca59f63af86f7b1d4c34ba8a926f6d42 - update translations for 6.4 Change-Id: I7b39d4365dec80d928b2844fe812b81dd20b1e4e
2020-01-21Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-4' to e2634177118353d07fbd22f9e4c6dc9b41e1cc16 - update translations for 6.4.0 rc3 and force-fix using pocheck Change-Id: I902bc9b9118b106605e454dfb7da73aa16f8c405
2020-01-21tdf#129582 sw: fix copying of flys in header/footer in DOCX/RTF importMichael Stahl6-32/+33
The problem is that the exception for writerfilter in IsDestroyFrameAnchoredAtChar() and IsSelectFrameAnchoredAtPara() is wrong in the case when the header/footer content is copied via SwXText::copyText(); that is, previously the situation was that writerfilter relied on Delete not deleting such flys (for RemoveLastParagraph) but Copy copying them. (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5 and e75dd1fc992f168f24d66595265a978071cdd277) So restrict the writerfilter hack to delete; this causes a problem with ooxmlexport9 test testTdf100075: it has 2 flys anchored at the same paragraph; writerfilter will insert the content into the body and then convert to fly; when the 2nd one is converted it will copy the 1st fly and anchor it inside the 2nd fly but then unotext.cxx:1719 will reset its anchor to inside the body... Prevent this unwanted copy by relying on the new parameter bCopyText that was introduced in 04b2310aaa094794ceedaa1bb6ff1823a2d29d3e, but change things a bit so that the case that pass in the extra flag isn't the copyText() one that wants the *normal* selection semantics in writerfilter import, but the 2 known places that want the *exceptional* selection semantics in writerfilter import (hopefully there aren't more). This is not ideal and the various bool parameters to CopyRange() plus mbCopyIsMove plus mbIsRedlineMove should probably be consolidated into some flags enum passed to CopyRange(). Change-Id: I638c7fa7ad0b4ec149aa6a1485e32f2c8e29ff5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87072 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 81ec0039b2085faab49380c7a56af0c562d4c9e4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87095 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-21tdf#129412: Crash when registered data source is not availableJulien Nabet1-0/+2
See bt here: https://bugs.documentfoundation.org/show_bug.cgi?id=129412#c4 Regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=9009663deb8f0862f419fd99bf0b761c7f923eff author Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> 2017-02-26 22:48:06 +0100 committer Tomaž Vajngerl <quikee@gmail.com> 2017-04-04 13:39:29 +0000 commit 9009663deb8f0862f419fd99bf0b761c7f923eff (patch) tree ea25976de0919f9d2161037d83be0eace4c1070b parent 1931b5b01c6fdaa204d26ec4b9675dad16373cf2 (diff) tdf#83257 [API-CHANGE] Pivot chart implementation Change-Id: Ib4de665f6e5380baf51589c92473ad88e8c9b84e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87096 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 2eacc795cf29a61e0561c8acba3168afe7c80be8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87124 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-21DOCX import: fix lost objects anchored to an empty linked headerMiklos Vajna3-2/+18
This is really similar to commit 04b2310aaa094794ceedaa1bb6ff1823a2d29d3e (DOCX import: fix lost objects anchored to the single para of a linked header, 2020-01-10), except here the header is not just a single-paragraph one, but has no text portions. Update text-copy.docx to have a header which is not only a single paragraph, but also has no character content. This keeps testing the original case, but now also tests the more strict case (single paragraph -> single empty paragraph). Change-Id: I11bb062e77af1a83f717225ea5b4daef39e5a672 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86552 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit c12358166a9bd88fe10feabca45a6ad3f65dff8e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87123 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-21DOCX import: fix lost objects anchored to the single para of a linked headerMiklos Vajna25-46/+97
Regression from commit 08f13ab85b5c65b5dc8adfa15918fb3e426fcc3c (tdf#112202 writerfilter,sw: fix loss of headers, 2019-12-16), the problem is that on one hand, copyText() is meant to copy a complete XText (header, table cell, footnote, etc), OTOH the internal API use used only copies at-para anchored objects for complete text nodes, so a one-paragraph header will loose its anchored objects when a linked header is copied. Introduce a new "CopyText" flag that provides the expected copyText() behavior and use that when the copyText() UNO API is invoked, but leave the selection behavior unchanged. Perform the inclusive check in IsSelectFrameAnchoredAtPara(), opt in for that from SwXText::copyText(), the rest is just passing the flag around. Change-Id: Id727f7ca4f6121a7050340359716a52ecb4886f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86529 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 04b2310aaa094794ceedaa1bb6ff1823a2d29d3e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87122 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-21Resolves: tdf#130075 have to specify which column is the text columnCaolán McNamara1-1/+7
in this two column case Change-Id: Ia999a0540b2d0f7c03a54241c61bf4c2231b8460 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87091 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-21Resolves: tdf#130090 xEntry should be xIconEntryCaolán McNamara1-1/+1
copy and paste error apparently Change-Id: Ifdeb90ececc200211ce41c55f2826987666cd401 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87088 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-21tdf#129481 Combine outliner indent and spacing undosJim Raykowski1-0/+8
Makes one undo when indent or spacing attribute is applied to outliner Change-Id: I1aefff746022552dec96f7cf76a5cb9540c84fc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86903 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit d6628ddaf6e2acf53c5a7cbbcb201d700cd95f54) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87094 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-21Resolves: tdf#130093 some lwp file not loadingCaolán McNamara5-7/+1
Change-Id: I2be53792f0fadcf1ca0e99c8f9fab7305d0fcddd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87101 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-20writerperfect[libwps,tdf#128673]: use the inFilter option in headless mode...alonso2-70/+99
Change-Id: I494360ddb55e39e09edf03aaf0bf6a01dc432f83 Reviewed-on: https://gerrit.libreoffice.org/82595 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit f14cd1ad62e6f17f2a1e56a7d4dfb8fad8d5375e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87076 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-20sw: fix assert in ToX update on mw00_table_of_contents_templates.docMichael Stahl1-3/+1
... exported to RTF and re-imported: soffice.bin: sw/source/core/txtnode/thints.cxx:1295: bool SwTextNode::InsertHint(SwTextAttr*, SetAttrMode): Assertion `!pAttr->GetEnd() || (*pAttr->GetEnd() <= Len())' failed. The problem is that the text of a HandledTextToken is all whitespace and a hint from 0 to 1 is inserted because mNewPositions.back() is erroneously 1, no idea why it was doing that. (regression from e5345f62bf525b6258736f1ce11a61b5e638e0ff) Change-Id: I6ec290abe50c0f65a3244f0f0bb07e19741e878b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86996 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ae56432d7e34529cd5ad391f074737d3f5adf137) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87057 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-20Update git submodulesOlivier Hallot1-0/+0
* Update helpcontent2 from branch 'libreoffice-6-4' to e99f03ffce30a949c6bb865b98de8d5a0473668f - Mute L10n for 'text/plain' mime type Change-Id: I9ab85205b199706d630e74b578ebbcec69a3170b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87068 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit fb916278132a481a2fdd0bd8450a2bf7066d5581) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87071 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-20tdf#129452 DOCX import: fix bottom border of merged columnSzabolcs Toth3-3/+27
Bottom border of a vertically merged column of a table was missing if the inside borders were turned off and the merge included the last cell of the column. This happened because the first cell (topmost) in a set of vertically merged cells determines the borders of the new merged cell, and the turned off inside borders were at the bottom in this case. Change-Id: I3d3defad18a1315117a554a36ad599eb46daffe9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85988 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 0f4dd820ee433932d9d9237b676292d31c4ba913) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86430 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-20tdf#129888 DOCX shape import: handle o:allowincellBakos Attila7-16/+54
(VML) and layoutInCell (DrawingML) attributes to fix regressions caused by commit 10f29d8bf05d44ca8bc11d34d1294ec17f8ac0f1 (tdf#87569 tdf#109411 DOCX import: fix shape anchor in tables). Position of shapes anchored to tables is calculated from the cell margin only if the previous attributes allow that. Change-Id: Ifcfcb7f4959aea522dd45dff00cefd1bb9f4edda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86922 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: xisco <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86980 Reviewed-by: Attila Bakos <bakos.attilakaroly@nisz.hu>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 07:27:21 +0000