summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-22Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - Add PDF Export View Page screenshot Change-Id: I76b4036e5d205a952d369d398db211545621e537 Reviewed-on: https://gerrit.libreoffice.org/83141 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit f10a2651b6aeb6472821cfe4f02eea2ab3e5ff53) Reviewed-on: https://gerrit.libreoffice.org/83500
2019-11-22Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - Add PDF Export Links Page screenshot Change-Id: I996183a122518ec18d5ffb5d60b9d30c1f328c8e Reviewed-on: https://gerrit.libreoffice.org/83140 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 867b60389e40ab6720c7b435b375563120aa3a2c) Reviewed-on: https://gerrit.libreoffice.org/83499
2019-11-22Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - Add PDF Export General Page screenshot Change-Id: I1f045faa224e8b24cc67a38989209217b15abdb1 Reviewed-on: https://gerrit.libreoffice.org/83139 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 3364b6db42899b82173030f26d58ca621b7f9a03) Reviewed-on: https://gerrit.libreoffice.org/83497
2019-11-22Update git submodulesLibreOfficiant
* Update helpcontent2 from branch 'libreoffice-6-4' - LibO Type statement extends enumerations to all data types. Change-Id: I8574a5c9290071c96618b1cb1aadc26068abd2b1 Reviewed-on: https://gerrit.libreoffice.org/82571 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 2647b00f50bee666a7e23bb5f8471269d03b41c9) Reviewed-on: https://gerrit.libreoffice.org/83494
2019-11-22Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - tdf#128808 Clarify Basic libraries containers Change-Id: Iaa85a3b0340eb88c8b81ee8070039c1e518789f6 Reviewed-on: https://gerrit.libreoffice.org/83092 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 75af753c3f78948c40ce34c5f6d61584b7e931a9) Reviewed-on: https://gerrit.libreoffice.org/83495
2019-11-22Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - Update and refactor PDF export Help pages Added Help for several new options Adjust options visibility for each module Split page into smaller pages Adjust Contents tree Change-Id: I03fd0a4cb99f36da0ea7911a1afb5d4be6648244 Reviewed-on: https://gerrit.libreoffice.org/83131 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 421131867de4fd2b80d066c2fecb8a1c39e6c227) Reviewed-on: https://gerrit.libreoffice.org/83496
2019-11-22tdf#128894: xlsx-import : Do not share tokens between cells...Dennis Francis
which are part of a xlsx-shared-formula along a *row*. If we do, any reference-updates on these cells while editing will mess things up. For example a shared formula "=A30+1" used for a few cells in the first row (say, A1, B1, C1 and D1) and on deleting a row, say row#5, the reference update operation will decrement the row index of all tokens in A1, B1, C1 and D1. But if they share tokens, they all end up pointing to row#26 instead of row#29 as each cell is updated which amounts to decrementing 4 times instead of once. However shared formulas along columns are not affected by this bug, when tokens are shared since we use formula-groups which only keeps one copy of token array for the entire group and reference-update code is designed to correctly work with formula-groups. Change-Id: Ic0fe84d12fef18fbf21658664e2b2b86409bca27 Reviewed-on: https://gerrit.libreoffice.org/83361 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit b30251ca0d102ced36799ee18d4bbcd9e8530fa0) Reviewed-on: https://gerrit.libreoffice.org/83476
2019-11-22tdf#124513 let wizard reappear on tabbing back to documentCaolán McNamara
where it was showing before tabbing away Change-Id: Ia87aeb9789ae034611431983c6489569a59d47d3 Reviewed-on: https://gerrit.libreoffice.org/83462 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-22tdf#127711 Fix msi-soffice.ini CrashDumpEnable-entryJuergen Funk
when the switch --disable-crashdump is set, then the switch "CrashDumpEnable" set to "false", was only in instdir/program/soffice.ini, but was not in soffice.ini in msi it was always true Change-Id: I2668c1425a776fdf5f0c4e4511c2216e8f418a5b Reviewed-on: https://gerrit.libreoffice.org/83171 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 73524467b9a6a7c4e6d5173aba79d80632ef46e2) Reviewed-on: https://gerrit.libreoffice.org/83289
2019-11-22tdf#121658 Roundtrip w:doNotHyphenateCaps via InteropGrabBagSamuel Mehrbrodt
Change-Id: I8a7efffb2866e46e978d09ca9fb5c9dec231e132 Reviewed-on: https://gerrit.libreoffice.org/83384 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 3185ce226447fb04c530af76f799fed86672f99c) Reviewed-on: https://gerrit.libreoffice.org/83397 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-11-22tdf#97926 Add UNO API for InfobarSamuel Mehrbrodt
This allows creating, updating and removing infobars from macros/extensions. It also extends the infobar with a primary and a secondary text, so there can be a bold summary at the beginning at the infobar with a longer text following in normal letters. Macro sample: ------------------------------------------------------------ Sub AddInfobar dim buttons(1) as new com.sun.star.beans.StringPair buttons(0).first = "Close doc" buttons(0).second = ".uno:CloseDoc" buttons(1).first = "Paste into doc" buttons(1).second = ".uno:Paste" ThisComponent.getCurrentController().appendInfobar("my", "Hello world", "Things happened. What now?", com.sun.star.frame.InfobarType.INFO, buttons, true) End Sub Sub UpdateInfobar ThisComponent.getCurrentController().updateInfobar("my", "WARNING","Do not read this message.", com.sun.star.frame.InfobarType.WARNING) End Sub Sub RemoveInfobar ThisComponent.getCurrentController().removeInfobar("my") End Sub ------------------------------------------------------------ Change-Id: I5d0a223525845d23ffab17acdaa431e0eb783fec Reviewed-on: https://gerrit.libreoffice.org/29816 Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de> Tested-by: Serge Krot (CIB) <Serge.Krot@cib.de> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 9e3ba7c3036c4d21e01d6f75ed29a1e8c4208141) Reviewed-on: https://gerrit.libreoffice.org/83405 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-11-22Replace hotfix with upstream patch, tdf#127887 follow-upEike Rathke
This attempt tries to avoid affecting other .wk1 files as well. The old fix was even applied to the wrong patch section, not done for MacOSX or Windows. Geez.. Change-Id: Ia79383f33ff760cba9bfb44f166e27f3ef212c57 Reviewed-on: https://gerrit.libreoffice.org/83431 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 1c58b2a437a7083c40c93a1c2e12a6fe6b6fd637) Reviewed-on: https://gerrit.libreoffice.org/83440
2019-11-22Resolves: rhbz#1775544 crash in navigatorCaolán McNamara
see demo reproducer in rhbz#1775544 nChildCount is a count of all descendants not just direct children. Just looping while FirstChild returns something is sufficient. Change-Id: If7b16032731d694bfffaae22faad5fe194d1822f Reviewed-on: https://gerrit.libreoffice.org/83455 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-22tdf#47490: Show overwrite warning when pasting data using "Enter"Aditya
In Calc when a cell is copied and its value is filled/pasted to different cell(s) by using the "Enter" key when focus is on selected cells -- replace warning is not shown even if the selected cells have values of their own inside it. The old data is simply lost. Provide a replace warning dialog box whenever such a case is encountered. Change-Id: I13acb424bc449e096512b5a0864ebc47a407f234 Reviewed-on: https://gerrit.libreoffice.org/83333 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 844b4ac41009143092ef08f163783d48dfbe9b77) Reviewed-on: https://gerrit.libreoffice.org/83450 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-11-22Revert "tdf#127579 DOCX export: fix losing color of ... ODT hyperlinks"Caolán McNamara
cause ~200 asserts of https://dev-builds.libreoffice.org/crashtest/299a13e8f7307b38ac10ad351273e2559e21ab16/backtraces This reverts commit 1d81d52b5da45f26e9d3adeb3b279eb9a488b94f. Change-Id: I8d00443f2fc8c71d6ef7baed5db0072847867ce1 Reviewed-on: https://gerrit.libreoffice.org/83433 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-22Update git submodulesSeth Chaiklin
* Update helpcontent2 from branch 'libreoffice-6-4' - tdf#128893 corrections in Navigator for Document Overview Change-Id: I9bb76d79540ee93ab05c227ccade494605ba54a0 Reviewed-on: https://gerrit.libreoffice.org/83413 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit b01173d325490f19537e67193bd383d475a55237) Reviewed-on: https://gerrit.libreoffice.org/83461
2019-11-22Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - Remove link to old help contents Change-Id: I71e5b7e0eae41e90075e907585abf00de47e4299 Reviewed-on: https://gerrit.libreoffice.org/83199 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit ccdc4ebe207ab439f424a64887ba3f3d0f87e9d8) Reviewed-on: https://gerrit.libreoffice.org/83452
2019-11-22Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - tdf#128227 disambiguate text frame and text box in summary, on Writer, Text frame -> Frame On other modules Text Frame -> text box Change-Id: I3b218fafb03cd5ab79c8c0b902ec417bf5445ff8 Reviewed-on: https://gerrit.libreoffice.org/82976 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit e20b575c56ebe912501e932192e509b6a227ce3c) Reviewed-on: https://gerrit.libreoffice.org/83451
2019-11-22Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - Fix L10N of xapian templates Change-Id: I23e3adc4a4232e9f9d998fa9f41951f7c530c335 Reviewed-on: https://gerrit.libreoffice.org/82721 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 4ad79a357b335ab87b0565ec18b3d17044ab502e) Reviewed-on: https://gerrit.libreoffice.org/83448
2019-11-22tdf#128862: fix HSQLDB odb-files with apostrophe crashJulien Nabet
see bt: 0 0x00007ffff209866a in std::type_info::name() const (this=0x0) at /usr/include/c++/9/typeinfo:100 1 0x00007ffff20966e1 in exceptionToStringImpl(rtl::OStringBuffer&, com::sun::star::uno::Any const&) (sMessage="DBG_UNHANDLED_EXCEPTION in bool connectivity::hsqldb::OHsqlConnection::impl_isTextTable_nothrow(const rtl::OUString&) exception: com.sun.star.sdbc.SQLException message: Unexpected token: S in statemen"..., caught= uno::Any("com.sun.star.sdbc.SQLException": {<com::sun::star::uno::Exception> = {Message = "Unexpected token: S in statement [s]", Context = uno::Reference to (com::sun::star::uno::XInterface *) 0x555559269238}, SQLState = "37000", ErrorCode = -11, NextException = uno::Any(void)})) at /home/julien/lo/libreoffice/tools/source/debug/debug.cxx:113 2 0x00007ffff209855d in DbgUnhandledException(com::sun::star::uno::Any const&, char const*, char const*, char const*, char const*) (caught= uno::Any("com.sun.star.sdbc.SQLException": {<com::sun::star::uno::Exception> = {Message = "Unexpected token: S in statement [s]", Context = uno::Reference to (com::sun::star::uno::XInterface *) 0x555559269238}, SQLState = "37000", ErrorCode = -11, NextException = uno::Any(void)}), currentFunction=0x7fffdb5ca340 "bool connectivity::hsqldb::OHsqlConnection::impl_isTextTable_nothrow(const rtl::OUString&)", fileAndLineNo=0x7fffdb5ca2e8 "/home/julien/lo/libreoffice/connectivity/source/drivers/hsqldb/HConnection.cxx:301: ", area=0x7fffdb5c9f49 "connectivity.hsqldb", explanatory=0x0) at /home/julien/lo/libreoffice/tools/source/debug/debug.cxx:418 3 0x00007fffdb58a16a in connectivity::hsqldb::OHsqlConnection::impl_isTextTable_nothrow(rtl::OUString const&) (this=0x555558a43de0, _rTableName="William Kidwell's Address Book") at /home/julien/lo/libreoffice/connectivity/source/drivers/hsqldb/HConnection.cxx:301 https://bugs.documentfoundation.org/attachment.cgi?id=155952 Change-Id: I2bc744164b1470d8f09bcb126b02e48af180e886 Reviewed-on: https://gerrit.libreoffice.org/83245 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit c5f0e89ee5b1d13416987ddceaccc4d8a0816986) Reviewed-on: https://gerrit.libreoffice.org/83435 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-11-22Update git submodulesAndras Timar
* Update translations from branch 'libreoffice-6-4' - Updated Slovenian translation Change-Id: If1e4f4928fe132d42f6955cce72bd1f10a9f2540
2019-11-22tdf#123774 OOXML chart export: keep digits of percentages of data points Balazs Varga
by exporting PercentageNumberFormat, checking the "Label" format directly and taking the respective number format based on that. Note: also fix the "LinkNumberFormatToSource" property. If we create a pie chart with data labels and set the "Show value as number" or "Show value as percentage" and check on/off "Source format", this move is not set the property in the XPropertySet. Because of this, it fixes also the export of correct value of "link-data-style-to-source" property into ODS files. But this patch doesn't fix the export of old ODS files to OOXML, because they contain wrong (always true) "link-data-style-to-source" value. Change-Id: I4098a245dec5bf35cde20c9ccb79aca726230118 Reviewed-on: https://gerrit.libreoffice.org/82703 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit a59eb39c6ec01ae2a9d8ddbb61a9c27f527c9caa) Reviewed-on: https://gerrit.libreoffice.org/83410
2019-11-22tdf#125300 extend AddParaSpacingToTableCells with line spacingLászló Németh
Now default compatibility mode AddParaSpacingToTableCells uses not only paragraph bottom margin, but also proportional line spacing before bottom cell border, as in MSO. Note: disable testForcepoint76, because it fails again with its fixed layout. Change-Id: I52f6204a5efc63aac4aa332a1563ada0cbeb9618 Reviewed-on: https://gerrit.libreoffice.org/83236 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 2c918aa51e5528b090e52fa31b10fa17cf2593ae) Reviewed-on: https://gerrit.libreoffice.org/83430
2019-11-21tdf#118263 Take over doc print options for new printerMichael Weghorn
Take over the current document-specific print settings for a newly created printer in 'sw::DocumentDeviceManager::Create_Printer_'. This makes sure that the options of an 'SfxPrinter*' retrieved by calling 'DocumentDeviceManager::getPrinter(true)' are in line with the 'SwPrintData' currently set. This among other fixes the issue described in tdf#118263, comment 7, i.e. the options shown in "File" -> "Printer Settings" -> "Options" were not properly initialized when the config option for loading user-specific settings with the document was disabled. (All checkboxes were unchecked in the UI in this case instead of showing the default values.) What happens is that when importing the document, 'bPrinterIndependentLayout' in 'SwXMLImport::SetConfigurationSettings' is 'false', so that this block is entered there: if( ! bPrinterIndependentLayout ) { xProps->setPropertyValue( "PrinterIndependentLayout", Any(sal_Int16(document::PrinterIndependentLayout::DISABLED)) ); } resulting in the following call stack where the printer is created and set: #0 sw::DocumentDeviceManager::setPrinter(SfxPrinter*, bool, bool) #1 sw::DocumentDeviceManager::CreatePrinter_() const #2 sw::DocumentDeviceManager::getPrinter(bool) const #3 sw::DocumentDeviceManager::setReferenceDeviceType(bool, bool) #4 SwXDocumentSettings::_setSingleValue(comphelper::PropertyInfo const&, com::sun::star::uno::Any const&) #5 comphelper::MasterPropertySet::setPropertyValue(rtl::OUString const&, com::sun::star::uno::Any const&) #6 SwXMLImport::SetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) [...] Writer's default settings were not applied in this case. For the case where loading user-specific settings is enabled, no printer is set at this stage, but it's later set in the call to 'SwView::GetPrinter', in which case there is already an explicit call to 'SetAppPrintOptions' after the printer is created via 'DocumentDeviceManager::getPrinter(true)', so all was fine there earlier as well. (Apparently, the same issue could be reproduced with the config option for loading user-specific options enabled, but an ODT document that has "PrinterIndependentLayout" set to "disabled" in it's settings.xml.) Change-Id: I39fd300fb56b767e7103b65537b0eac1365e5fd7 Reviewed-on: https://gerrit.libreoffice.org/83394 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 46f8f48ebfe25e26b4d1c0718c772abbee70b889) Reviewed-on: https://gerrit.libreoffice.org/83428
2019-11-21tdf#128775 Writer Hyperlink dialog: fix encoding of inserted target URL Tünde Tóth
text, also its preview in the dialog window, when the URL contains anchor at the end. Change-Id: Ibedb86238f660177b3dd476cd6a13f1ca5f05e12 Reviewed-on: https://gerrit.libreoffice.org/82654 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 79a1fafadb1ac54b8212bc164d8b85d798c74937) Reviewed-on: https://gerrit.libreoffice.org/83414 Tested-by: Jenkins
2019-11-21Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-4' - tdf#128911 typo in formula SUMIF. Change-Id: I30241cc84bc715ac9ae0a6af39db3a9e95476860 Reviewed-on: https://gerrit.libreoffice.org/83391 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-11-21tdf#119054 DOCX: fix not table style based bottom marginLászló Németh
in table cells, ie. using paragraph styles with bottom margin setting or direct paragraph formatting of bottom margin. Both of them overwrite the table style based bottom margin. Change-Id: I527b16c24fe47df8412291089ff86fadd3f9430b Reviewed-on: https://gerrit.libreoffice.org/82800 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 6100909c84550036932d031f4d2f652e158a1a0a) Reviewed-on: https://gerrit.libreoffice.org/83154 Tested-by: Jenkins
2019-11-21tdf#128598: Revert "Move dubious file: -> smb: conversion from...Stephan Bergmann
INetURLObject to file UCP" It turns out that there is lots of code in and around e.g. SfxMedium::LockOrigFileOnDemand (sfx2/source/doc/docfile.cxx) that treats document URLs non-generically and treats file URLs specially. That means that it does not work to transparently rewrite a file URL as an smb URL in the underlying UCB layer. So for libreoffice-6-4 revert the change again. (For master towards LO 6.5, I plan to instead completely drop the feature of silently treating certain forms of file URLs on Linux as smb URLs.) This reverts commit 46c645bf4e9909f5296e75028f1f5434e83942d2. Conflicts: tools/qa/cppunit/test_urlobj.cxx ucb/source/ucp/file/prov.cxx Change-Id: I94ac0637115bea36924099951efd8542854a727d Reviewed-on: https://gerrit.libreoffice.org/83396 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-21tdf#84183 Give infobar close btn some 'clicked' stateSamuel Mehrbrodt
Slightly smaller cross when the button is clicked on to have some feedback for the user Change-Id: If0486319e9816378b2011bbb366b4c577c1ad84a Reviewed-on: https://gerrit.libreoffice.org/83087 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 60c0874227201310c099fb717c0a665dbcf5bb33) Reviewed-on: https://gerrit.libreoffice.org/83190 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-11-21tdf#84929 sw UI: stay at footer when showing controlJustin Luth
Scenario: a new document where the first thing the user wants to do is create a footer. Scroll down to the bottom of the page (this does mean that you can't see the top of the page, right? None of my screens show an entire page by default anyway...) and click in the footer area. The screen jumps back to the top of the page and the user needs to scroll to the bottom again in order to enable the footer. So, in the very specific case of the control being turned on (because I don't care about a jump if the control is being turned off) don't process a return to the cursor position. Regression potential: The only use case I can think of is someone trying to drag a section by starting too low on the page. The early return will quickly cancel any kind of drag attempt. Basically if the user clicks in the footer area without intending to get the separator bar, it might act differently than what previously happened. I don't really see this scenario as a problem. One additional limitation could be added to only apply this if it is dealing with the footer, since in the case of a header there would be no screen-jump. Change-Id: I11cd3089b85d8eb49063b902e6bf8bf2e1412aa7 Reviewed-on: https://gerrit.libreoffice.org/82701 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 342a5890dbcddccb4013e201e3ff3d9e6967e733) Reviewed-on: https://gerrit.libreoffice.org/83376
2019-11-21tdf#42112 Add support for Custom Line CapBartosz Kosiorek
original patch updated by Chris Sherlock Change-Id: Ie68c3cc40d2c7263a0f786a973da77b00e4cbeb8 Reviewed-on: https://gerrit.libreoffice.org/82564 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit d15518584a3197e4b8318d0176352a0584f42167) Reviewed-on: https://gerrit.libreoffice.org/83297 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2019-11-21libxslt: upgrade to release 1.1.34Michael Stahl
Fixes CVE-2019-18197. Remove obsolete e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1. Change-Id: I95cf498e245083528f98bfef8cdd240bbe2211b9 Reviewed-on: https://gerrit.libreoffice.org/83312 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit e9ea24cc004a8b9a5856f2f268bd40433c504db1) Reviewed-on: https://gerrit.libreoffice.org/83377
2019-11-21tdf#128748 replace warning dialog with tooltipCaolán McNamara
so the TreeList does not get the mouse release it expects stolen from it by the dialog, leaving it stuck in "selecting" limbo Change-Id: If83dcdd8697b2a67e67fb062ae65ad947f49e8cd Reviewed-on: https://gerrit.libreoffice.org/83373 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-21tdf#128434 free the BasicManager event listenerJan-Marek Glogowski
This gets rid of the last 72 lost bytes I could identify in the huge valgrind logs to look like its PDF generation related. Change-Id: Idda3c2c5b7f5ce0211199b86503037b74438ccf2 Reviewed-on: https://gerrit.libreoffice.org/83302 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 48b23bbfa0271ed327f668933b92d2ae9b99e806) Reviewed-on: https://gerrit.libreoffice.org/83350
2019-11-21If a SdrOle2Obj object is missing/broken show the preview set for itCaolán McNamara
if the object isn't valid, e.g. link to something that doesn't exist, set the fallback graphic as mxGraphic so SdrOle2Obj::GetGraphic will show the fallback, otherwise the failing mxObjRef.is test in SdrOle2Obj::GetGraphic means it doesn't get used Change-Id: I8f1aea6b25dc216e01a0f888a44d10876bb1bebd Reviewed-on: https://gerrit.libreoffice.org/83328 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-21poppler: upgrade to release 0.82.0Michael Stahl
fixes CVE-2019-9903 CVE-2019-9631 CVE-2019-9545 CVE-2019-9543 CVE-2019-14494 CVE-2019-12293 CVE-2019-11026 CVE-2019-10873 CVE-2019-10872 CVE-2019-10871 CVE-2019-10018 remove obsolete 0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 Change-Id: I72b3bf89b294ed3e24157c7e75fd58d4f68d9f35 Reviewed-on: https://gerrit.libreoffice.org/83308 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 28e52c49452320ac76489d0f93ca5692456e5331) Reviewed-on: https://gerrit.libreoffice.org/83335 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-11-21libxml2: upgrade to release 2.9.10Michael Stahl
... which is, surprisingly enough, required to build the latest libxslt. Change-Id: Ifbb36ed61b8f68185f9c788f63a8edeb58899f94 Reviewed-on: https://gerrit.libreoffice.org/83311 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit d1bf39a78ed239d4493f0470ca937852265e79d6) Reviewed-on: https://gerrit.libreoffice.org/83346 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-11-20tdf#124399 DOCX import: don't apply inside borders to 1-cell tablesSzabolcs Toth
Extra cell borders appeared on the bottom, top, left or right of the 1-cell tables when only the "inside borders" option was selected. The extra borders were the ones that would normally have appeared as inside borders if there were more than one cells in the table. Change-Id: I05d5f2a5a0168989f220d20a95b6dacf5152f9f7 Reviewed-on: https://gerrit.libreoffice.org/82675 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 8a59f18b6eb22c43ec10cdc29ba5a13d5feba4f0) Reviewed-on: https://gerrit.libreoffice.org/83303 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-11-20tdf#128812 speed up loading calc doc with lots of countifNoel Grandin
by creating a copy of ScQueryCellIterator that is specialised for this use-case. Takes the opening time from 50s to 8s on my machine. Change-Id: I193a7c181a5dfed6fecf75e871729d73625d0df6 Reviewed-on: https://gerrit.libreoffice.org/83299 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit d468958331f36310d11265ba55d7c27366ab58ab) Reviewed-on: https://gerrit.libreoffice.org/83316 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-11-20tdf#128889: don't write "page break after" into w:pPrMike Kaganski
This produced invalid OOXML, which Word considers as "page before", and LibreOffice ignores when re-importing. Make sure to write it as *trailing* w:r with w:br, as Word also does when imports ODT with this atribute, and saves as DOCX. Change-Id: Ifc4f45d65d4455ecb5cd62aed1ef6a03375c8aa4 Reviewed-on: https://gerrit.libreoffice.org/83232 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit b0e7e494b6bc69d3833c0a6c256ff8106a4a24cb) Reviewed-on: https://gerrit.libreoffice.org/83334 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-11-20honour MenuFlags::AlwaysShowDisabledEntries for native gtk menusCaolán McNamara
Change-Id: I3d26320061f3da01e9b857cb3dad277f3d7aa4f5 Reviewed-on: https://gerrit.libreoffice.org/83324 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-20hide help buttons when LibreOfficeKit::isActive and local help unavailableCaolán McNamara
Change-Id: Ia263f9f7c78dbf48143678fc2f577402fb1ce998 Reviewed-on: https://gerrit.libreoffice.org/83323 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-20tdf#128820: use wps namespace for simple text shapesMike Kaganski
Without that, simple text shapes inside groups were written in <pic:wsp> elements, with many child elements also having pic:: prefix. Change-Id: I114cf3499e03aa5ca042211d7b134aaf5b0e7fbf Reviewed-on: https://gerrit.libreoffice.org/82980 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Also consider saved exceptions when terminating parse As with previous commit 18ae77a065cb8ae6940d4067f6ab7e99a3f74047, this will start showing parse errors on invalid files which previously just opened without warnings, silently losing the invalid stream part. Any bug bisected to this commit is not a regression from this commit! The real problem was already before, and was just disclosed by this (which is the actual goal). Also simplify unit test data for tdf#128820, which will now be enough after the change. A unit test (testN779627) revealed unexpected throws when parsing; this was fixed. Change-Id: I5a21b9001874ec6e3b8273c10043ef930bf1cc82 Reviewed-on: https://gerrit.libreoffice.org/82981 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> tdf#128820: improve unit test to not depend on opening bad file failing ... also test exported XML directly Change-Id: I50237593dd111e7c7974452769c8d49c22012713 Reviewed-on: https://gerrit.libreoffice.org/83005 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Fix UBSan build after 9fdf8c0a5cc036ea9bd1e11dd8f2c1a6e601fae2 The said commit simplified a testdoc to testTdf128820, using a smallest possible SVG in it. This seems to produce the smallest possible PNG of size 8, which is passed into GraphicDescriptor::ImpDetectPNG. There its size is read into nTemp32 past the end of the file without checks, which keeps last value of the variable (which was the magic number 0x0d0a1a0a), which is then saved into the descriptor. Then that value is used in ImpGraphic::ImplGetSizePixel, and later multiplying it in lclConvertScreenPixelToHmm causes UB. Fix by checking all the reads in GraphicDescriptor::ImpDetectPNG. Change-Id: Ib4740fac2b87fbef57d5150151129b9852f3ecb8 Reviewed-on: https://gerrit.libreoffice.org/83119 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/83296
2019-11-20sw: revert change in expanding hints in SwXText::insertTextContent()Michael Stahl
The SwXText implementation for inserting text works like this: * XTextPortionAppend methods appendTextPortion()/insertTextPortion() get the text properties passed as a parameter, and they should apply only those properties to the inserted text, not expand any existing formatting hints at the insert position. * XSimpleText method insertString() does expand existing formatting at the insert position, just like editing in the UI does For inserting XTextContent: * XTextContentAppend methods appendTextContent()/insertTextContentWithProperties() with properties parameter, similar to XTextPortionAppend * XTextContent::insertTextContent(), without properties So arguably, by analogy to inserting text, the methods that take properties should not expand hints, and the insertTextContent() should follow the insertString and expand hints. Commit 18cbb8fe699131a234355e1d00fa917fede6ac46 is an important bugfix for writerfilter import, but the problem is, it added the DontExpandFormat() call to insertTextContent(), whereas the regression it was fixing (from commit 232ad2f2588beff50cb5c1f3b689c581ba317583) was that the call was removed from insertTextContentWithProperties(). So restore the state before 232ad2f2588beff50cb5c1f3b689c581ba317583. Turns out that SwUiWriterTest2::testTdf126206 was checking how a bookmark-start is formatted instead of how the text is formatted. Change-Id: If524409f88a1a36aa062b6e132996d3f9c1bb571 Reviewed-on: https://gerrit.libreoffice.org/83223 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 635bd7fbcb1d131627ba98fd9085dd2b11e0d33c) Reviewed-on: https://gerrit.libreoffice.org/83292
2019-11-20Use initializer list for unordered_set hereMichael Weghorn
Change-Id: I9099308834d7bf463bd92c07edc86b8e0aa1fe84 Reviewed-on: https://gerrit.libreoffice.org/82785 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 469888757b751f6b510d98bf5456f041da3e44b5) Reviewed-on: https://gerrit.libreoffice.org/83273
2019-11-20tdf#115576 sw: fix borders for single row/col autotable stylesJustin Luth
The 4*4 autostyle table matrix has no box format that can handle a table with a single column or single row. So the first and last row/column boxes need to be combined to get all of the necessary borders. This could easily be seen by setting one column and X rows using the default table style - missing right border. It could also be seen by setting one row and X columns using Box List yellow - missing bottom border. Change-Id: Ib2cf873b6d4e10ba5145e680ea7b3e2e3aea3970 Reviewed-on: https://gerrit.libreoffice.org/82998 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 46fcf87725818666fee34226afdac4a64edd94eb) Reviewed-on: https://gerrit.libreoffice.org/83170 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-11-20Resolves: tdf#128900 can't edit initial macro with empty user profileCaolán McNamara
Change-Id: I5e28a4253b755fc3f5ed7c02c99c2611513e5bd8 Reviewed-on: https://gerrit.libreoffice.org/83284 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-20tdf#121186: sync itemset and supportsFullDrawingLayerFillAttributeSetMike Kaganski
In the bugdoc, there are three separate section styles, first of which (Sect1) has fo:background-color attribute set to #ffffff, others with no background-related attributes. The sections using the styles are nested, the outermost one using the style Sect1 with background color. When the XML is read, SwXTextSection::attach is called, which fills an item set with values stored in an SwTextSectionProperties_Impl struct, SvxBrushItem with color value of 0x00ffffff among them. The resulting set contains the SvxBrushItem item (WhichId = RES_BACKGROUND = 105). No XATTR_FILL_FIRST .. XATTR_FILL_LAST are put into the set. When later the Edit Sections dialog is opened, SectRepr objects are constructed for each section, and the brush is taken from section's format using makeBackgroundBrushItem. It checks supportsFullDrawingLayerFillAttributeSet, and if yes, uses getSvxBrushItemFromSourceSet to fill in the SvxBrushItem; the latter only considers XATTR_FILL_FIRST .. XATTR_FILL_LAST in the passed set. For the SwSectionFormat, supportsFullDrawingLayerFillAttributeSet inherited from SwFrameFormat returns true, which means that existing RES_BACKGROUND item is ignored, and default transparent color is returned. Fix by returning false from supportsFullDrawingLayerFillAttributeSet for SwSectionFormat. This makes nested sections' properties and behaviour match what was in older versions (4.0), where all three nested sections took white fill; and only setting innermost section's fill to none made it transparent (show document's background). Change-Id: Id0b4fce221cfa9c54097e69a3acfdf018a1043b5 Reviewed-on: https://gerrit.libreoffice.org/83016 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 8586051f02125e7358984d2cd14c5383b26bd246) Reviewed-on: https://gerrit.libreoffice.org/83244 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-11-20Resolves: tdf#128811 Alignment option "Distributed" not working in calcCaolán McNamara
Change-Id: I605b62ef0dfa29db93e4d7df8285a05a12bda8e3 Reviewed-on: https://gerrit.libreoffice.org/83271 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-20ofz#19010 wrong start of rangeCaolán McNamara
Change-Id: Ibf97a830932d3f153b99031abc8c4a00b54cedab Reviewed-on: https://gerrit.libreoffice.org/83266 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins