summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-20Update git submodulesOlivier Hallot
* 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 Toth
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 Attila
(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>
2020-01-20tdf#129417 Rename "Full-sheet previews" to "Whole sheet export"Roman Kuznetsov
in PDF option dialog Change-Id: Ib772599a68366be29f208e27f830b79015dbdc13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86593 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com> (cherry picked from commit b711f56b612c408560d2743bca0f01a9109f416f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87036 Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-01-19tdf#127619: external/nss: Load smime3 lib with a path on macOSStephan Bergmann
A plain dlopen("libsmime3.dylib",...) would search (among other places) DYLD_FALLBACK_LIBRARY_PATH, which when unset defaults to a set of paths including /usr/local/lib (so would erroneously find Homebrew's /usr/local/lib/libsmime3.dylib instead of LO's LibreOffice.app/Contents/Frameworks/libsmime3.dylib next to the calling LibreOffice.app/Contents/Frameworks/libnspr4.dylib). At least macOS 10.15.2 supports a "@loader_path/" prefix in dlopen, to find the requested library next to the calling code, so use that as a quick fix. (Should that turn out to be problematic, there is PORT_LoadLibraryFromOrigin in workdir/UnpackedTarball/nss/nss/lib/util/secload.c that might be useful in a more elaborate fix.) Change-Id: I8688606017a4b32a2dd55740f67b8fdb36fc5435 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86966 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a3ca9b88b4b38c008efa868844ba7a3105b4bcca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86969 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-18Related: tdf#127782 call signal_expanded after expansion in gtk caseCaolán McNamara
which is the same as the gen one Change-Id: Ia93598bb88d5a3f93c62e7096f8bc4ca69698a19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86564 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-18gallery theme dialog should be modalCaolán McNamara
Change-Id: I3c32851cda40254c73b0040f92466eedb7427d6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87028 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-17tdf#129788: Revert "no need to use AlphaMask in RecentDocsViewItem"Xisco Faulí
This reverts commit 31bd8c4a4a4752dcff12ee35636193f79a6d6137. Similar to 5c54778aad677d6bb6e6687f0f43dffad1aefa1e Change-Id: Ibb4daa702df1f683888b92b8b8041f28e25e6b04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86998 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-17tdf#128304 export TB_RL writing mode as eaVirtMark Hung
and import eaVirt to TextWritingMode instead of TextPreRotateAngle (-90) degree of CustomShapeGeometry. CJK text in TB_RL writing mode are upright in Writer. It corresponds to eaVirt by its defintion. Change-Id: I2a8bc6676ad6af06b06e023adaa2f201a028d426 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86637 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Signed-off-by: xisco <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86960
2020-01-17tdf#129655 Sync TextWritingMode to frame direction.Mark Hung
Sync the text writing mode of a shape to the frame direction of the attached text box ( a text frame ). Change-Id: Ied9ff1a1d0f53d7ef78a83a086af0a2c1ca5eb36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86638 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Signed-off-by: xisco <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86961
2020-01-17tdf#129924 critical fix: use SvxColorItem instead of SvxBrushItemSerge Krot
Change-Id: I09b1e9fe53315974864c8d6947c7cb861f069a68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86953 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c5747c64d3134ec6d8b6ab6fdc938639157fca09) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86978 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-17tdf#129924 docx import: set background colorSerge Krot
Change-Id: If586a7a11e375c1592253630af87772bca40b52e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86542 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 9476dfe7d1b86b367966e7dedf67e11936c8d9d7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86895 Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de>
2020-01-17tdf#129680 Make text edit outliner view show cursorJim Raykowski
Better placement of tdf#50530 fix 80f18e7e028e9ca431aef281ab98bea99ad19fa3 Change-Id: If6a83d94ebd52ada34d800f8270fa82b4260fdbf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86099 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 1840ed1ede481d28c1a75e2767357866f6f1c55a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86956 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-17tdf#129839: pass initialized shared_ptr to SwDoc::GetBoxAttrMike Kaganski
Regression after commit 1e2682235cded9a7cd90e55f0bfc60a1285e9a46 Change-Id: I40acc9e0ffdd292283381366a31eb6647b80324f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86291 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 4056b70e6339102374898fff26f099da455475b1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86329 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-17tdf#126795 docx export: do not output tab stops twiceSerge Krot
Change-Id: I70235df7fb73133f413863ee5eb7c76905a60248 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86767 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 264d27c94d7286a407b05a32f4097ac9d543e1a3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86896 Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de>
2020-01-16Remove a fragment from a file URL early onStephan Bergmann
...as ShellExecuteExW would ignore it anyway Change-Id: I969db094bb7d2ea230ac8c36eb23d71a90fbe466 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86868 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 14b36a16b225bf7c988f118d499a7287c47cd83e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86875 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-01-16Fix build with poppler-0.83Martin Milata
Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 Reviewed-on: https://gerrit.libreoffice.org/84384 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86905 Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> Tested-by: Tomáš Chvátal <tchvatal@suse.com>
2020-01-16Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' to 191058eba782a34dad89959d5a20d6f2edd4bc3a - tdf#129604 Place localized images in right makefile Change-Id: Ia0b9328d218b4a59a6483f3468c163ec82329d99 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86793 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-16do not ignore return value of a (confusing) function (tdf#126248)Luboš Luňák
The two ScCellFormat::GetString() overloads are lame API, one returns the value normally and the other one returns void and uses a reference parameter. I got confused by this in 6f810e3d7dafcd7d0101173a501 and didn't use the return value in one case. Change-Id: I0b6c839f9d0299e14ea022813481802275df5ea6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86750 Tested-by: Jenkins Reviewed-by: 锁琨珑 <suokunlong@126.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 5a211ba9f5f465c8c898ebce4cc37fa30581acac) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86835 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-15tdf#129574 sw: fix RTF export of table of contentsMichael Stahl
The problem is that the hyperlink that starts at the start of the first paragraph of the ToX content is written to RTF before the TOC field itself, so the hyperlink contains the entire ToX: {{\field{\*\fldinst HYPERLINK "#__RefHeading___Toc250984071" }{\fldrslt {\rtlch\langfe1024 \ltrch\lang1024\loch {\field{\*\fldinst { TOC \\o "1-3" \\h \\z }}{\fldrslt {1.India\tab 1}}}} This is because the HYPERLINK is written into m_aRun but the TOC into m_aRunText. Interestingly StartRun() asserts that m_aRunText should be empty, so we don't try to change StartURL() to write the HYPERLINK into m_aRunText. The only function that moves text from m_aRunText to m_aRun is EndRun(), so wrap the TOC field in StartRun()/EndRun(). This breaks the export of the ToX to DOCX because a mysterious SDT is no longer written around the field but only the field result, so only do this for RTF. Change-Id: I22e45c4a9c9ce6edb2b9114b4a29b2a373ec3284 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86860 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 05d833a26208404e5f2b3d61298a57c9bcc7c1fe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86872 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-15tdf#129525 writerfilter: ignore GOTOBUTTON fieldMichael Stahl
The bugdoc contains nested fields for some of the page numbers: {\field\flddirty{\*\fldinst {\caps0\lang1024 GOTOBUTTON _Toc434317064 }{\field{\*\fldinst {\caps0\lang1024 PAGEREF _Toc434317064 }}{\fldrslt {\caps0\lang1024 4}}}}} The problem is that the outer field does not have a \fldrslt, only the inner PAGEREF field has one. This used to be imported incorrectly because the nested field's result ended up in the outer field's result; now it's imported correctly but then there's no field result to show, because Writer can't expand fieldmarks. As we can't do anything with a GOTOBUTTON field, just ignore it explicitly to prevent creating a generic fieldmark; the PAGEREF is already ignored inside of a ToX since commit 9679e9c23216decb5f9f25f85b04cb3f25211111. ("regression" from e511a0ca5dde6d731bb126bbfe21768867890102..d9030ad6298e2f49ee63489d6158ea6ad23c0111) Change-Id: I8135c8d14995378181ce959d22d9be5ea0cae260 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86796 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit f761059b8c8ffe4e7b6e28924898ba71ee6b9ea8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86832 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-15tdf#129393 Calc: cannot format whole row of unprotected cellsNoel Grandin
regression from commit 3c3a371c799d00475deb13b4c3e0a8860c7e4fb3 tdf#125254 Performance: A spreadsheet opens too slow, part2 Change-Id: I87e06a58d6a4eb1a32bdf7e9267a4fe9d6dc4f2a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86826 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86830
2020-01-15pyuno: remove racy debug checkMichael Stahl
The use-after-free is easier to trigger than expected; i don't see how it's possible to check this without a race. Change-Id: I4afb7066d1bf6b34f4f56aa0f51be0643ae40a66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86481 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 777ae8101e23a31bdf806c1d09f0c849e47bb8ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86486 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-14tdf#129805 writerfilter: fix import of nested generic fieldMichael Stahl
The problem was that the end of the outer nested generic field did not call PopFieldmark(), so the end of the field was at the end of the document. (regression from f610f9b611fe9f206b872ed06f7e859d688385fc) Change-Id: If5928b14dd35f7dd509370c2b8eef4c31bd149dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86785 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit cf226535f9903a048b1c105b180ae3a50a776e68) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86797 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-14tdf#129516 DOCX import: fix incorrect z-order with textboxesMiklos Vajna
Commit 3272c1eb5563f3bda2caa24f32b1018372622109 (related tdf#100074: prepare group shapes text input via writerfilter, 2018-10-01) tweaked the oox code, so that later it'll be able to call back to writerfilter to parse group shape text. That makes sense, but it also removed the reset of the group shape context, which means that two subsequent group shapes are now imported as a single group shape with a merged child list. Reset the group shape context again when writerfilter asks for the XShape from oox. If this causes a problem for the above scenario later, then it could be considered to handle this in ShapeContextHandler::endFastElement(). (cherry picked from commit 5960c6f4ca9dd6ab4b4081d3be7253468cd212c4) Change-Id: I14f7f0bab2c66c8430313d5b2daffe3160a58c27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86746 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-13ofz#20051 if duplicate exists then m_ObjToRecMap points to deleted elementCaolán McNamara
Change-Id: I854410ba1d5c0a622b5ba9c6816a24a3477e5089 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86685 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-13solenv/flatpak-manifest.in: Merge "remove dconf access"Stephan Bergmann
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/b15fd5cb85280ac60bdd1d763fe5b715057ab267> Change-Id: If2af9110b07518fb0fb2c65ca490f9e1125de8a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86662 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 714b7a76665655dc5d090c6ab4a715c085b52739) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86675 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-13tdf#129908 Crash at Data > Group and outlone > AutoOutlineNoel Grandin
regression from commit 7282014e362a1529a36c88eb308df8ed359c2cfa tdf#50916 Makes numbers of columns dynamic. Change-Id: Ie0eff58c7db5a3c85cfea480ca1fea5767fd8cfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86683 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit b56e0d7f7fb9f1ca9295ac2ba540a3cf778324b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86692
2020-01-13tdf#128207: DOCX import: fix chart positioningBakos Attila
Embedded graphic objects had got 0 values for vertical and horizontal positioning before, resulting overlapping, hidden charts, but now they are positioned according to the values in the document. Change-Id: Ia5403ac65ff7192d61072e8a9d8a7f80c7178b9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86521 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit d9c535ead688e9f156dbcf43948df08a69e218be) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86536 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-13python3: bundle libffi for GNU/Linux buildsMichael Stahl
CPython commit f40d4ddff3c800b3c956a5e8820aabe3aa87cddd "Closes #27979: Remove bundled copy of libffi" causes a bit of a problem because it turns out that libffi isn't all that stable; there's libffi.so.5 on CentOS 6, libffi.so.6 on CentOS 7 and libffi.so.7 on lo_daily_update_gandalf tinderbox. So we have to bundle it in LO; it's only used on GNU/Linux currently. CPython commit 32119e10b792ad7ee4e5f951a2d89ddbaf111cc5 "bpo-35947: Update Windows to the current version of libffi (GH-11797)" also removes the libffi for MSVC, so in a future python upgrade we will have to build libffi for MSVC too. The libffi fork for MacOSX is still in CPython git master. (regression from b10be5d48433076f0b7238d818020f708553e114) Change-Id: Ibc20cf8cd3614cf9941b6970662bd930496776b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86493 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 79084665f0e351a3f83fdee88071919f05ec9cc3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86500 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13Update git submodulesAndras Timar
* Update dictionaries from branch 'libreoffice-6-4' to ab88309069f2df5dd010654d294c094ff2adc970 - corrected Slovenian readme and package description Change-Id: Iaeece79f64ed03a63191afe9a5f55cbd298a5ed5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/86644 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-12Update git submodulesAdolfo Jayme Barrientos
* Update helpcontent2 from branch 'libreoffice-6-4' to 927b9f89df5519d053e3c0d12198776ed07f6f32 - Revert "tdf#108869 repair icon on help file" This reverts commit ed4c9e733e8d0c62f17da3f5db1e1292d02cfa1e. Reason for revert: It breaks the string freeze. Change-Id: I27e1ea91921c9b5635e818719379ed283823378c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86641 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-12Update git submodulesSeth Chaiklin
* Update helpcontent2 from branch 'libreoffice-6-4' to ed4c9e733e8d0c62f17da3f5db1e1292d02cfa1e - tdf#108869 repair icon on help file - updated path to image Change-Id: I70e8312d61e4163d7e654c4945eb520c7414f741 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86617 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 0d44ebef2f2c5829ff4998d9890aaf8f612a1ed3) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86639
2020-01-12Resolves: tdf#129763 resize to request happening on every activateCaolán McNamara
even though the state remains the same, so only do the resize if the EnableClearFormatButton[All] state changes. also change the default to off, which is what writer typically set it to, and make calc the one that enables it explicitly. Its easier to grow a dialog than shrink a dialog. Change-Id: I449df7b7dcf0204b5143b8ad88e528668b84d0a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86614 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-12Resolves: tdf#129904 use the current page as the page for helpCaolán McNamara
in the options dialog which has a non-standard organization for its contents vs an ordinary dialog Change-Id: I6a50652f5ae3fe2e8b4d32933bec6dc0217cbec1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86577 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-11Resolves: tdf#127417 delete-all tabs doesn't workCaolán McNamara
since... commit 1e2682235cded9a7cd90e55f0bfc60a1285e9a46 Date: Thu Apr 18 19:25:06 2019 +0200 WIP: Further preparations for deeper Item changes because since then aNewTabs is cloned, but on delete-all aNewTabs is reset to a SvxTabStopItem with a 0 WhichId so its clones are useless Change-Id: I725bec90d8915b3546afeed590f21ebdbbdaa355 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86579 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-11python3: fix 32-bit x86 buildMichael Stahl
The reinvented wheel needs another subst. Change-Id: I5bc01b0213f00d383cf971d34f0dc2a9e6817ab9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86480 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit db75ec187051090e2eb1b13745fe11a2a5bb1dd0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86485 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-10oox: add missing nullptr checksXisco Fauli
See http://crashreport.libreoffice.org/stats/signature/oox::drawingml::chart::PlotAreaConverter::convertFromModel(oox::drawingml::chart::View3DModel%20&) Regression from 11473832b5717cb3222ce72baee885bc9e8e2386 Change-Id: I6cf08582fb384203ca1ce5736b88b85c11ff56da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86483 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit aa499120c4cb3935cd942751859b6d5d3689ea43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86523 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-10tdf#115026: Add uitestXisco Fauli
Change-Id: Iaac2a1065c0c1c28e56db8a121cb28453e27d529 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86497 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 43d8dc34d74832e928c2cc215e9bf512f4edf3b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86504
2020-01-09tdf#115026 sw tableAutoFormat: don't clear break/keepJustin Luth
If a table style HAS defined a page-break or keep-with-next-paragraph, then apply it when applying the style. But if the format just has a default non-break/non-keep attribute, then don't apply that. Kinda seems artificial/arbitrary, but it looks difficult to change the break/keep property to be an optional component. If it was optional, then it would be fine to take a defined non-break and apply it, but since it is a mandatory value, just ignore the default state. Yes, this means that applying one style can introduce a break/keep, but applying a different style cannot remove it. None of the build-in styles has either of these properties set. Since there is no way to identify direct formatting, assuming the user intentionally set these is the better policy by far... I didn't do the same thing with shadow/collapsing borders etc. Those seem more like table style properties than these two flow items. I still couldn't get the unit test to work. I got access to the created document by removing EnableKillingFile from swmodelbase, and from that I can see that the autoformat is not affecting the table with RestoreTableProperties. I assume the Break is overwritten during the table creation process because I can see the background being applied in that case, but still no Break. Change-Id: Ia2a4ff8a19158b1ea5d74ec3a21c688c53d66724 Reviewed-on: https://gerrit.libreoffice.org/83879 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 43f983d08d66520536980339f33ef44d5eec35f6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85838 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-09Get PDB files to work for soffice.bin and unopkg.binJuergen Funk
..by renaming them to *.bin.pdb, so WinDbg picks them up. Follow-up fix to commit 6ca3adf22b62b88b313c8fc9311183efdabe445a Change-Id: I5cb7b305c997b423cf0cd70835163811f75b3e25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86465 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d3f138efc185e1ee781943d44eb33b82d46ca577) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86470 Tested-by: Jenkins Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
2020-01-09tdf#121458: chart: change "Data Ranges" button enabled condition.Vasily Melenchuk
"Data Ranges" button right now enabled if chart has no own table (as it was before 0074951704022d173a5fdb9df933f47be1dcbb91) or own table exists and it is possible to create data provider (LibreOffice will warn later about destroying data table). Change-Id: If92b0aad8a6099250effdb68022addb277ef4371 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86391 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 985b76d237b26b428771bfc03d1ef74cdb5d77f0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86402
2020-01-09tdf#128782: sw: set name for draw frame style for text boxVasily Melenchuk
Since new undo/redo code operates style names instead of pointers, it is important to have all formats with name. Change-Id: Ib91cd13b8a324ae674e9ace9bb5f17e679bd2dab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86162 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit c79dcf98d662e76b1290f8d43c927d1031e94729) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86399 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-01-09python3: remove _uuid moduleMichael Stahl
Of course the autotetection in setup.py strikes again, the build will fail if the user doesn't have libuuid-devel installed; we'd need to add a check to LO's configure.ac for libuuid. Let's just not ship it, not sure if anybody needs it. Change-Id: I9079309da7d9c16e666fbab30542365124f97860 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86433 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ebb6c2576af8d883ddf8eb09e3969c50d9ac07c9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86448 Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-09tdf#129256: don't create objects only to destroy when moving preserved arrayMike Kaganski
Restructure the StepDCREATE_IMPL code to do the preservation step before creating the objects for the rest of array. Change-Id: I4e4ba718af2da035b08397522e726eb131f813a4 Reviewed-on: https://gerrit.libreoffice.org/84706 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit bc1a8c682f889e488a7961faa0708568c480438a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84739 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-09tdf#129353, tdf#129402: fix node creation on index importMike Kaganski
ToC, bibliography, and index sections import code changed to closely follow what Word does, make sure that pre-rendered entries don't get imported as standalone paragraphs outside of the index sections, and paragraph count is accurate (no missing or added paragraphs as much as possible). In Word, an index may start and end in the middle of a paragraph: <w:p> <w:r> <w:t>Some text before index</w:t> </w:r> <w:r> <w:fldChar w:fldCharType="begin"/> </w:r> <w:r> <w:instrText> TOC ...</w:instrText> </w:r> <w:r> <w:fldChar w:fldCharType="separate"/> </w:r> <w:r> <w:t>First pre-rendered index entry</w:t> </w:r> </w:p> ... <w:p> <w:r> <w:t>Last pre-rendered index entry</w:t> </w:r> <w:r> <w:fldChar w:fldCharType="end"/> </w:r> <w:r> <w:t>Some text after index</w:t> </w:r> </w:p> However, normally it looks like either no runs precedig index, or no runs of pre-rendered contents will be present. When no Std elements are used, the typical situation is that there's a normal paragraph (possibly with some user text), which ends with index start marker, without any pre-rendered contents in the same paragraph; and all pre- rendered contents goes in following paragraphs. Such index normally ends with index end marker in the *first* run of a paragraph, which then might have normal text runs. When Stds are used, then no leading/trailing out-of-index runs in paragraphs with marks are usually present; and in this case, when paragraphs with index marks don't contain pre-rendered entries, they still are treated as part of the index. In Writer, indexes are node sections (and so cannot be inline with other paragraph contents). When there was some paragraph content already before the start-of-index mark, the paragraph is assumed to end before the index; in this case, when current <w:p> element ends, importer decides if a separate starting paragraph is needed or not, depending on if there was some runs after the mark. When there was no text runs before the starting mark, then the paragraph is treated as leading paragraph of the index. This allows to not miss empty paragraphs before index; and not have two paragraphs where there was one in Word. Only in cases when user had manually typed text both in and outside of the index in the same paragraph in Word, we would have the paragraph split into two in Writer. For end marks, the behaviour depends on whether it's inside Std. When inside, the ending paragraph starting with index end mark is considered part of the index. For out-of-Std case, it's considered normal paragraph (and measures are taken to make sure it's not dropped even if empty, because sometimes such paragraphs don't have other content, and have section settings, which is usually treated by Writer as "drop this paragraph" sign). A special problem is multi-column index. It's wrapped into a continuous section by Word; and in Writer, we also wrap it into a section. It would be possibly useful to detect somehow if this section is part of index definition, and in this case, drop the section and put its properties into the Writer's index section. That would avoid an explicit section in the imported document. This is TODO, for someone who figures how to detect reliably if the section belongs to index definition. See comment in DomainMapper_Impl::appendTextSectionAfter. By the way, current export code is wrong, producing an index that is single-column in Word; this change doesn't touch that. Several existing tests needed to be fixed, which used to test wrong results. Reviewed-on: https://gerrit.libreoffice.org/85089 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 5cdb14345842c07eb1a466897753da910e9488f8) Change-Id: I9597c8ab13f31ded9abcc24054d3478d3e3a3b40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85289 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-01-09tdf#129887: fix crash during scrolling down documentSerge Krot
regression from tdf#129708 Change-Id: I6c5d7eb90030234e899ab8ce5b3adec33e03962a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86454 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit a3c3f21a742f7c7f587bd63ee2617a150bb39b96) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86460 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-08bump product version to 6.4.1.0.0+Christian Lohmaier
Change-Id: I4dd8377f4c16f73362d397a054a5b57441efb365
2020-01-08Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-6-4' to a7bd83b1b05ea2a4604ca73b011afca6ae9b8f40 - update translations for 6.4.0 rc2 and force-fix errors using pocheck Change-Id: I271c6f6ca96a7cfd41bfc51b5e9894033b17fabc
2020-01-08tdf#123262 writerfilter: completely ignore footnote separatorsJustin Luth
... except for processing enough to observe the separator exists. For each footnote reference, the entire footnote.xml file is parsed every time. The text in the "separator" footnote was being added to every footnote. The normal case where this is just a single paragraph was already handled, but this patch generalizes everything to handle cases of actual text or multiple paragraphs. Not every footnote has a type, so we can't depend on that to turn ignoringText ON/OFF. Every footnote has an ID, but theoretically the ID could be processed before or after the type, and it has no idea which type it is. Finally, the skipped text has no idea how many times/paragaphs it needs to skip. So a three-way control was needed to handle on/used/off. As a safeguard, finishing the footnote.xml parse (PopFootOrEndnote) ensures that ignoring won't be left on in the unlikely case that the separator is the last footnote. Change-Id: Ia30ca8d3a36417a4691e3b2e1c978720be017030 Reviewed-on: https://gerrit.libreoffice.org/82172 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit acb9d901009d026cb48e6a8b94e6200f05110504) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85734 Reviewed-by: Michael Stahl <michael.stahl@cib.de>