summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-03-25fix assert when loading id:000059,sig:11,src:000008,op:havoc,rep:2.lwpNoel Grandin1-4/+1
one of caolans test files, which appears to have a row layout which references a non-existent parent. Change-Id: I9322ed430aa9edd47db9967a19938b02e4af6bc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90475 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-03-25Defect type: IDENTIFIER_TYPOCaolán McNamara1-2/+2
identifier_typo: Using "Libreoffice" appears to be a typo: "Libreoffice" is only known to be referenced here, or in copies of this code. Identifier "LibreOffice" is referenced elsewhere at least 19 times. Change-Id: I201bcc7e226dde52eed2c0281d2b9839a234af1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91033 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-03-25no reason for the FontAntiAliasing setting being UNX-only (tdf#107744)Luboš Luňák4-42/+2
This dates back to the ancient times where no revision control history dares, so no idea why this was so, but it doesn't make sense, as at least Windows can disable AA for fonts too. And if some platform really wants to hide the setting, it should be enough just to hide the UI element, no reason for '#if defined( UNX )' all over the place. Change-Id: I76fc9ad157358321904573079ace5a3fe556f86a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91041 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-03-25Sukapura: Update many style iconsRizal Muttaqin104-69/+91
- Update Curve & Freeform icons - Add larger Cell Styles icons - Update Navigation Data icons - Update Numeric Field icons - Update to Curve & to Polygon icons - etc Change-Id: Iffa13ee13fac13ba5b95f14496efa5419154b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91028 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-03-25Sifr: :Fix for tdf#131509Rizal Muttaqin18-6/+14
Change italic in Spanish from C to K Change-Id: I5b1da84983827a17565143bda984d7ae3b5e0518 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91040 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-03-25lokit: Mark document as modified on chart insert/edit...Dennis Francis2-0/+12
immediately at least in the case when LOKit is active. This is to allow prompt emission of .uno:ModifiedStatus=true statechange message from lokit to the client. Without this, in online the chart insert/modify related changes may not get saved on client exit. Change-Id: I8c38a37cc455f74a70d43b6aaa3e5035b283d47f (cherry picked from commit 75adb624dfff4659e6f3099a1720fbd697560f9c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91036 Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-03-25Fix test for /usr/share/java/flute-1.3.0.jarStephan Bergmann1-1/+1
The old test was always true (as -f/usr/share/java/flute-1.3.0.jar is not the null string), so in a --with-system-jfreereport build that did not explicitly configure --with-flute=..., FLUTE_JAR was always set to /usr/share/java/libxml-1.0.0.jar, even if that file does not exist (as e.g. on Fedora, where e.g. flute-1.3.0-22.OOo31.fc32.noarch includes /usr/share/java/flute.jar instead). The only use of FLUTE_JAR is in gb_Jar__use_flute in RepositoryExternal.mk, and the only use of that is in reportbuilder/Jar_reportbuilder.mk, but which seems to not mind if the given jar doesn't exist? Change-Id: Iea94ed34b4df61d2abed67b54bd4caa24ede7e80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91039 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-03-25SdrGrafObj: don't check the primitive sequence for PDF to get metadataTomaž Vajngerl1-0/+6
For a PDF we create a BitmapPrimitive2D only, so it doesn't have any metadata in the primitive sequence itself, but a call to the getVectorGraphicData() method will render the PDF in order to create the BitmapPrimitive2D. This is a problem when we have multiple pages as we want them to be rendered on demand and not right away on load. This change short-circuits the gathering of metadata for PDF to prevent unnecessary early rendering of PDF pages. Change-Id: If5c286e88e72c4c0ba5083a98c7db707d207b6cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91034 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-03-25remove a dependency that doesn't make a senseLuboš Luňák1-3/+1
Change-Id: Idc88476213a01643f5ba6b8ea9fbee78673d7769 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91032 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-03-25Fix typoAndrea Gelmini1-1/+1
Change-Id: I959a8bcc133d5f54ce991dff490ef339698be58a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91025 Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-03-25Fix typoAndrea Gelmini1-1/+1
Change-Id: I22dad8c614e04da2234746834fffa8365c71d713 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90226 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-03-25Missing dependencyStephan Bergmann1-1/+1
Change-Id: I877364593025de65695995729a12294748c949ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91010 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-03-25tdf#106843 docxexport: don't write double docProtectJustin Luth4-15/+32
regression from LO 6.4 commit 2756ed9317e3474003c11ffe7d1e2f087c1412bf Change-Id: Iaf32974c7282d11bcd9572ed75cf1233ad3f0008 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90321 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-25Remove unused using declarations in oox...xmlsecurityGabor Kelemen91-133/+0
Found by: run-clang-tidy-10 -checks=-*,misc-unused-using-decls Change-Id: I3e95791e223ef01e140a6217e29a9efae428a784 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90876 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-25Remove some unused includesMiklos Vajna3-6/+0
Change-Id: I4897a6f2622e3e219f8b7b93d818d2edca03b117 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91008 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-25external/nss: Fix rpath for Linux et alStephan Bergmann2-0/+15
See CustomTarget_postprocess/check_dynamic_objects (in a --with-package-format=... build) failing after 8512f4ca090c85477a6670438aeefe7fdfcf8a98 "build nss using their new build system (gyp/ninja-based)" with > instdir/program/libsmime3.so has no RPATH > instdir/program/libnssutil3.so has no RPATH > instdir/program/libnssdbm3.so has no RPATH > instdir/program/libfreeblpriv3.so has no RPATH > instdir/program/libsqlite3.so has no RPATH > instdir/program/libfreebl3.so has no RPATH > instdir/program/libnssckbi.so has no RPATH > instdir/program/libnss3.so has no RPATH > instdir/program/libsoftokn3.so has no RPATH > instdir/program/libssl3.so has no RPATH workdir/UnpackedTarball/gyp/pylib/gyp/generator/ninja.py already has logic to add -Wl,-rpath=$ORIGIN/... to certain link command lines, presumably for building certain executables, but of which we apparently include none in ExternalPackage_nss, so it shouldn't hurt to keep them using that other -Wl,-rpath=$ORIGIN/... I have no idea whether there would be a cleaner way than this patch to pass an additional -Wl,-rpath=$ORIGIN to all link command lines via the invocation of build.sh in ExternalProject_nss (even if those executables mentioned in the previous sentence would then have two -Wl,-rpath=..., that should not hurt in practice). (Most, if not all of the rpath-related hunks of external/nss/nss.patch that were needed for the make-based nss build on Linux et al prior to 8512f4ca090c85477a6670438aeefe7fdfcf8a98 can probably be removed in a follow-up commit.) Change-Id: I65eaf52efeb6feceb8540e0aedf340f9a9a18599 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91012 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-03-25Fixes to the Tip Of The Day messages from weblate feedbackMuhammet Kara1-2/+2
Fixes suggested by SteenRønnow Change-Id: I21e9ec2084baff3fb4cbbf9a3cadcf63662c1da6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91021 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-03-25Remove extra space from the ToTD messageMuhammet Kara1-1/+1
TOTD: Tip Of The Day Fix suggested by vpanter on weblate instance Change-Id: I545819bf7581b45776cdc07aa3731e2a69885082 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91015 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-03-25Fix a tip of the day messageMuhammet Kara1-1/+1
Reported by Tuomas Hietala on our weblate instance Change-Id: I699fa4c231d4a4ad4f474fe72183f89104c1a532 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91014 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-03-24Sukapura:^ Color related icons & wrap icons,+Chapter Numbering iconsRizal Muttaqin65-26/+1040
Change-Id: Iea7866df74ad2ea68c8d797f1fa75f384e1e2ac4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90999 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-03-24tdf#131530 keep prepending footnote frameJan-Marek Glogowski2-3/+3
Fix function name typo and actually prepend the footnote frame, as the original code did. So much about "easy refactoring" :-( Regression from commit 24caeee8236576abd92086974c1dbbf15b81a4c5 ("Refactor a bit of the footnote handling code"). Change-Id: I227e30bc169fdfc237a5239d3ade6f035d85ca6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91004 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-03-24Accept iOS SDK 13.4Tor Lillqvist1-2/+2
Change-Id: I7ef4acfd009c9e7fa0adf31a2f50f507b957bac9
2020-03-24tdf#131542 EMF+ Implement BeginContainer recordBartosz Kosiorek2-3/+32
Change-Id: If388ef4544001fb9064aed3ce979c2790ab0645f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90997 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2020-03-24ofz#21168 sw,writerfilter: limit writerfilter hack to writerfilterCaolán McNamara10-2/+46
The problem is that at the end of WW8 import, a delete redline is inserted that ends up calling DeleteAndJoin from inside AppendRedline(). A fly is anchored AT_CHAR at (node 46, offset 0) and the deletion goes from (node 46, offset 0) to (node 48, offset 13) hence the special case check in IsDestroyFrameAnchoredAtChar() for the IsInReading() prevents it from being deleted, and then its anchor is still registered at the node 46 when it gets deleted. So try to restrict the WriterfilterHack to writerfilter, so it won't affect WW8 import. Unfortunately this is far less obvious than expected, because import can happen for creating a new file, in which case it's all done via UNO in writerfilter, or when inserting into an existing file, in which case SwReader::Read() is used. The SwDocShell's pMedium can't be used becuse in insert file case it will be the loaded file, not the inserted file. There isn't any obvious alternative to adding a silly UNO property for the writerfilter to use. Change-Id: Ia7fdc9bb1925202f6692ebee6e4b6b1fe50e5345 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90384 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-03-24vcl: fix startup of a sanitized soffice.binMiklos Vajna1-1/+1
warn: sal.osl:19830:19830:sal/osl/unx/module.cxx:162: dlopen(instdir/program/libvclplug_genlo.so, 257): instdir/program/libvclplug_genlo.so: undefined symbol: _ZTI20FreetypeFontInstance This was originally done in commit 781c4402f1a8c64f87bc81e866bc444b9ed97948 (make some classes module-private, 2019-11-02), but it did not cause problems till recently. I guess this started to be a problem when the gen vcl plug started to interact with freetype directly in the skia case. Change-Id: I05ef0ff4446de32deccff6d7ee1fde991e5a0256 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90995 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-03-24lokit: unify fill transparency itemsDennis Francis2-0/+54
Online just listens to .uno:FillFloatTransparence but the set-item in core it corresponds to, does not represent the fill-transparency types like 'None' and 'Solid'. This is represented by another item called XFillTransparencyItem. As a result the mobile wizard does not show the correct transparency fill type always. To solve this, this patch encodes the constant transparency percentage in case of Solid and None(always 0%) as an intensity and stores this info in the statechange message of .uno:FillFloatTransparence whenever there is no gradient type and corrects the 'style' attribute of the message appropriately. More detailed information is provided as comments at appropriate places in the patch. Change-Id: I443ef4ce349badf28f6c2c702b1014868d9c6ed5 (cherry picked from commit 34969e9c04f9305d19826c72a29e38e26794cbe3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90986 Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-03-24Update git submodulesAdolfo Jayme Barrientos1-0/+0
* Update helpcontent2 from branch 'master' to 81a863eb6fe5932e2161266dae6e7bfb4152a0c4 - README: Add Weblate badge for helpcontent2 l10n Change-Id: Ieb89f42e51a04bfa73732a779a92b79a755bc644
2020-03-24sduilo-SdPageListControl doesn't exist anymoreCaolán McNamara1-3/+0
Change-Id: I865ad6e7546b829306ee5c2a8648068ec4c151c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90980 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-03-24Set Boost baseline to 1.66, and enforce itStephan Bergmann1-1/+1
According to the mailing list thread starting at <https://lists.freedesktop.org/archives/libreoffice/2020-March/084722.html> "Reasonable boost baseline?", 1.66 should cover --with-system-boost at least for contemporary Debian, RHEL, and SUSE based distros. And at least our AX_BOOST_BASE from m4/ax_boost_base.m4 by itself only issues a AC_MSG_NOTICE if no appropriate Boost is found, so add an explicit AC_MSG_ERROR to make configure fail in that case. Change-Id: Ifdf6566af785f613c62f9c5a4b85cf80cec672c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90985 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-03-24Initialize bufferMike Kaganski1-2/+2
Also assert that correct data type is passed to SbiStringPool::Add. Change-Id: I774d983be82d702b31de1054d13661e1d0e9c1dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90983 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-03-24Revert "tdf#95425 follow-up: enable "Source format" checkbox of data label"Stephan Bergmann10-25/+51
This reverts commit 9bf40c635c41c6b3b072b7c61fea67a20ba4342b. Reason for revert: This apparently causes builds to hang. Witness all the six failed Jenkins builds for <https://gerrit.libreoffice.org/c/core/+/90079> as well as <https://ci.libreoffice.org/job/lo_tb_master_linux_dbg/29218/> and following. Change-Id: I441e04cba0f1234cdc200a9aa714b166bda4ab89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90950 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: Jenkins
2020-03-24Update git submodulesLibreOfficiant1-0/+0
* Update helpcontent2 from branch 'master' to cf6f0df5ad826b72513b2f1c465518bfe723c72e - Fix to Property misleading snippet Change-Id: Ie96f829d21384a9adab81e9b007d0773c035b97c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/90948 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-03-24weld writer navigator expand and collapse all supportJim Raykowski1-2/+20
Makes expand and collapse all work from the outline context menu and ctrl+* short cut for all vcl plugins Change-Id: I6cec6f1b4dedfc62216028b24d09d7f402a387cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90973 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-03-24icu: add patch to fix CVE-2020-10531Michael Stahl2-0/+119
Change-Id: I0aca4af1bd79f28bf1c920a4d05e80948106aaac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90971 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-03-24tdf#95425 follow-up: enable "Source format" checkbox of data labelBalazs Varga10-51/+25
settings after file opening, if its value is true in the opened ODF or OOXML document, instead of always showing disabled state. Testing notes: double click on a data label during chart editing to see the Data Labels for Data Series... window. On the page "Data Labels...", click on the Number format... button to see the checkbox "Source format". Change-Id: Idb837d9492ad7e83b9020167c47ed52499c070a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90079 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2020-03-24VBA Err object raise method TestCasesLibreOfficiant2-0/+87
Err.Raise(#) enables 'User-Defined Exceptions' Std Basic alternative is: Error # 'without parentheses which throws pre-defined error codes. Change-Id: I76229b237066e33229d4d13e6742c660887fda2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85017 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-03-24weld writer navigatorCaolán McNamara43-2904/+3222
GtkToggleToolButton are much wider than vcl equivalents. Split the bottom toolbar into two toolbars. Rearrange their contents so the layout of each level visually match. Notes: Master documents have two modes, master content tree and the normal content tree. You can drag entries from the content tree into the document, drag mode drop down controls whether its a link or a copy etc that's dropped in. Documents can be dropped into the content and global trees. If outline tracking isn't active, then when content changes the tree is cleared and refilled, typically an effort is made to reselect the same entry that was previously selected. Additionally, if the amount of content didn't change an effort is made to scroll back to the location the scrollbar was at before the clear. Change-Id: I00c015145eac5b1acc3398d3c40861d830e4264a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89725 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-03-24Breeze, Colibre, elementary, Karasa Jaga :Fix for tdf#131509Rizal Muttaqin9-15/+17
Change italic in Spanish to K from C Change-Id: Ie82625f8a605de67c036a76ce438de1e883203f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90966 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-03-24Removed duplicated includesAndrea Gelmini2-2/+0
Change-Id: If00e89686210be5f76208a5e3ff366096f4ac9fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90927 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins
2020-03-24Simplify the LibreOfficeKit mobile phone and tablet APITor Lillqvist3-23/+15
There is not need to ever change the kind of device a view is for, so why bother with the bool parameter to setMobilePhone() and setTablet(). Also, make sure just either of them is called, at most once, for a view. Change-Id: I9ac872f0ab4772e4a7c40c49f62b32fa7b1e47f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90968 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-03-24Resolves: tdf#131507 createCairoSurface returns nullptr on failureCaolán McNamara1-1/+1
Change-Id: I05190a6f280ebbe750dfda56ef27d3362222b95f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90940 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-03-24tdf#131296: get numeric value with its data type in StepLOADNCAndreas Heinisch6-24/+113
In order to load numeric values, generate SbiOpcode::NUMBER_ opcodes including the numeric value and its data type instead of SbiOpcode::CONST_. The numeric value and its data type will be restored in SbiRuntime::StepLOADNC. When the new compiled code is stored in documents, e.g. password-protected libraries, leagcy LO versions will just read up to non-numeric characters, thus correctly obtaining number value and ignoring the type, so the change is backward-compatible. To interpret legacy compiled code, old treatment of SbiRuntime::StepLOADI is restored, reverting commit 0b4f8bf571baf2ccd5a8aafdc4deb41867420be3. This change reimplements the fix for tdf#129596. Change-Id: I46ebfc77f9bea69479968950c0fb7264e4a7ab27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90858 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-03-24Fix typoAndrea Gelmini1-1/+1
Change-Id: I5a430d2e681b0c95476b4b59ca5281da6a05ee8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90924 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-03-24Fix typoAndrea Gelmini1-1/+1
Change-Id: I6fd01def988cf0bb04569f80cad30b96fd868b81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90938 Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-03-24Clear SbxAppData::m_aGlobErr earlyStephan Bergmann2-1/+3
...before the destruction of the std::unique_ptr<SbxAppData> xSbxAppData; member during the destruction of BasicDLLImpl can set that BasicDLLImpl::xSbxAppData to null. Because the destruction of SbxAppData::m_aGlobErr may call into SbxValue::Put -> SbxBase::GetError -> GetSbxData_Impl, which would recursively access that return *BasicDLLImpl::BASIC_DLL->xSbxAppData; This causes problems with libc++ (i.e., on macOS), where ~std::unique_ptr sets its internal pointer to null before calling the destructor of the pointed-to object. Whereas it happens to not cause problems with e.g. libstdc++, where ~std::unique_ptr calls the destructor of the pointed-to object first before setting the pointer to null. The problem showed up with <https://gerrit.libreoffice.org/c/core/+/85017/14> "VBA Err object raise method TestCases", where CppunitTest_basic_macros kept failing on macOS with > * thread #1, queue = 'com.apple.main-thread', stop reason = EXC_BAD_ACCESS (code=1, address=0x0) > frame #0: 0x00000001119f18e7 libsblo.dylib`SbxValue::Put(this=0x000000014c1cff00, rVal=0x00007ffeefbf1218) + 55 at basic/source/sbx/sbxvalue.cxx:414 > 411 bool SbxValue::Put( const SbxValues& rVal ) > 412 { > 413 bool bRes = false; > -> 414 ErrCode eOld = GetError(); > 415 if( eOld != ERRCODE_NONE ) > 416 ResetError(); > 417 if( !CanWrite() ) > Target 0: (cppunittester) stopped. > (lldb) bt > * thread #1, queue = 'com.apple.main-thread', stop reason = EXC_BAD_ACCESS (code=1, address=0x0) > * frame #0: 0x00000001119f18e7 libsblo.dylib`SbxValue::Put(this=0x000000014c1cff00, rVal=0x00007ffeefbf1218) + 55 at basic/source/sbx/sbxvalue.cxx:414 > frame #1: 0x00000001119f2399 libsblo.dylib`SbxValue::Clear(this=0x000000014c1cff00) + 553 at basic/source/sbx/sbxvalue.cxx:176 > frame #2: 0x00000001119f20d0 libsblo.dylib`SbxValue::~SbxValue(this=0x000000014c1cff00, vtt=0x0000000111a2af70) + 80 at basic/source/sbx/sbxvalue.cxx:139 > frame #3: 0x00000001119f825d libsblo.dylib`SbxVariable::~SbxVariable(this=0x000000014c1cff00, vtt=0x0000000111a2af68) + 381 at basic/source/sbx/sbxvar.cxx:125 > frame #4: 0x00000001119e619a libsblo.dylib`SbxProperty::~SbxProperty(this=0x000000014c1cff00, vtt=0x0000000111a2af60) + 42 at basic/source/sbx/sbxobj.cxx:861 > frame #5: 0x000000011188ce81 libsblo.dylib`SbUnoProperty::~SbUnoProperty(this=0x000000014c1cff00, vtt=0x0000000111a2af58) + 97 at basic/source/classes/sbunoobj.cxx:2591 > frame #6: 0x000000011188ceb3 libsblo.dylib`SbUnoProperty::~SbUnoProperty(this=0x000000014c1cff00) + 35 at basic/source/classes/sbunoobj.cxx:2591 > frame #7: 0x000000011188cf0c libsblo.dylib`SbUnoProperty::~SbUnoProperty(this=0x000000014c1cff00) + 28 at basic/source/classes/sbunoobj.cxx:2591 > frame #8: 0x000000011180c235 libsblo.dylib`SvRefBase::ReleaseRef(this=0x000000014c1cffa0) + 197 at include/tools/ref.hxx:163 > frame #9: 0x000000011184fda7 libsblo.dylib`tools::SvRef<SbxVariable>::~SvRef(this=0x000000014c1d2490) + 55 at include/tools/ref.hxx:56 > frame #10: 0x000000011184a545 libsblo.dylib`tools::SvRef<SbxVariable>::~SvRef(this=0x000000014c1d2490) + 21 at include/tools/ref.hxx:55 > frame #11: 0x00000001119be5af libsblo.dylib`SbxVarEntry::~SbxVarEntry(this=0x000000014c1d2490) + 47 at basic/source/sbx/sbxarray.cxx:31 > frame #12: 0x00000001119bc3d5 libsblo.dylib`SbxVarEntry::~SbxVarEntry(this=0x000000014c1d2490) + 21 at basic/source/sbx/sbxarray.cxx:31 > frame #13: 0x00000001119bed29 libsblo.dylib`std::__1::allocator<SbxVarEntry>::destroy(this=0x000000014c1940a0, __p=0x000000014c1d2490) + 25 at c++/v1/memory:1931 > frame #14: 0x00000001119becfd libsblo.dylib`void std::__1::allocator_traits<std::__1::allocator<SbxVarEntry> >::__destroy<SbxVarEntry>((null)=std::__1::true_type @ 0x00007ffeefbf1448, __a=0x000000014c1940a0, __p=0x000000014c1d2490) + 29 at c++/v1/memory:1793 > frame #15: 0x00000001119beccd libsblo.dylib`void std::__1::allocator_traits<std::__1::allocator<SbxVarEntry> >::destroy<SbxVarEntry>(__a=0x000000014c1940a0, __p=0x000000014c1d2490) + 29 at c++/v1/memory:1630 > frame #16: 0x00000001119bec7b libsblo.dylib`std::__1::__vector_base<SbxVarEntry, std::__1::allocator<SbxVarEntry> >::__destruct_at_end(this=0x000000014c194090, __new_last=0x000000014c1d2490) + 91 at c++/v1/vector:426 > frame #17: 0x00000001119bebab libsblo.dylib`std::__1::__vector_base<SbxVarEntry, std::__1::allocator<SbxVarEntry> >::clear(this=0x000000014c194090) + 27 at c++/v1/vector:369 > frame #18: 0x00000001119bea47 libsblo.dylib`std::__1::__vector_base<SbxVarEntry, std::__1::allocator<SbxVarEntry> >::~__vector_base(this=0x000000014c194090) + 39 at c++/v1/vector:463 > frame #19: 0x00000001119be958 libsblo.dylib`std::__1::vector<SbxVarEntry, std::__1::allocator<SbxVarEntry> >::~vector(this=0x000000014c194090 size=3) + 40 at c++/v1/vector:555 > frame #20: 0x00000001119bafa5 libsblo.dylib`std::__1::vector<SbxVarEntry, std::__1::allocator<SbxVarEntry> >::~vector(this=0x000000014c194090 size=3) + 21 at c++/v1/vector:550 > frame #21: 0x00000001119bb457 libsblo.dylib`SbxArray::~SbxArray(this=0x000000014c194080, vtt=0x0000000111a385e8) + 71 at basic/source/sbx/sbxarray.cxx:75 > frame #22: 0x00000001119bb4a3 libsblo.dylib`SbxArray::~SbxArray(this=0x000000014c194080) + 35 at basic/source/sbx/sbxarray.cxx:74 > frame #23: 0x00000001119bb4fc libsblo.dylib`SbxArray::~SbxArray(this=0x000000014c194080) + 28 at basic/source/sbx/sbxarray.cxx:74 > frame #24: 0x000000011180c235 libsblo.dylib`SvRefBase::ReleaseRef(this=0x000000014c194080) + 197 at include/tools/ref.hxx:163 > frame #25: 0x000000011184dbd7 libsblo.dylib`tools::SvRef<SbxArray>::~SvRef(this=0x000000014c1cfe58) + 55 at include/tools/ref.hxx:56 > frame #26: 0x000000011184cc25 libsblo.dylib`tools::SvRef<SbxArray>::~SvRef(this=0x000000014c1cfe58) + 21 at include/tools/ref.hxx:55 > frame #27: 0x00000001119e0d10 libsblo.dylib`SbxObject::~SbxObject(this=0x000000014c1cfdd0, vtt=0x0000000111a37d18) + 288 at basic/source/sbx/sbxobj.cxx:111 > frame #28: 0x000000011188b73d libsblo.dylib`SbUnoObject::~SbUnoObject(this=0x000000014c1cfdd0, vtt=0x0000000111a37d10) + 221 at basic/source/classes/sbunoobj.cxx:2387 > frame #29: 0x0000000111990d51 libsblo.dylib`SbxErrObject::~SbxErrObject(this=0x000000014c1cfdd0, vtt=0x0000000111a37d08) + 113 at basic/source/classes/errobject.cxx:184 > frame #30: 0x0000000111990d83 libsblo.dylib`SbxErrObject::~SbxErrObject(this=0x000000014c1cfdd0) + 35 at basic/source/classes/errobject.cxx:183 > frame #31: 0x0000000111990dfc libsblo.dylib`SbxErrObject::~SbxErrObject(this=0x000000014c1cfdd0) + 28 at basic/source/classes/errobject.cxx:183 > frame #32: 0x000000011180c235 libsblo.dylib`SvRefBase::ReleaseRef(this=0x000000014c1cfee8) + 197 at include/tools/ref.hxx:163 > frame #33: 0x00000001119bcac6 libsblo.dylib`tools::SvRef<SbxVariable>::clear(this=0x0000000110e365a8) + 70 at include/tools/ref.hxx:64 > frame #34: 0x00000001119ca764 libsblo.dylib`SbxAppData::~SbxAppData(this=0x0000000110e365a0) + 84 at basic/source/sbx/sbxbase.cxx:49 > frame #35: 0x00000001119ca965 libsblo.dylib`SbxAppData::~SbxAppData(this=0x0000000110e365a0) + 21 at basic/source/sbx/sbxbase.cxx:45 > frame #36: 0x000000011199272b libsblo.dylib`std::__1::default_delete<SbxAppData>::operator(this=0x0000000110e2cfb0, __ptr=0x0000000110e365a0)(SbxAppData*) const + 43 at c++/v1/memory:2363 > frame #37: 0x00000001119926af libsblo.dylib`std::__1::unique_ptr<SbxAppData, std::__1::default_delete<SbxAppData> >::reset(this=0x0000000110e2cfb0, __p=0x0000000000000000) + 95 at c++/v1/memory:2618 > frame #38: 0x0000000111992649 libsblo.dylib`std::__1::unique_ptr<SbxAppData, std::__1::default_delete<SbxAppData> >::~unique_ptr(this=0x0000000110e2cfb0) + 25 at c++/v1/memory:2572 > frame #39: 0x0000000111992625 libsblo.dylib`std::__1::unique_ptr<SbxAppData, std::__1::default_delete<SbxAppData> >::~unique_ptr(this=0x0000000110e2cfb0) + 21 at c++/v1/memory:2572 > frame #40: 0x00000001119925f5 libsblo.dylib`(anonymous namespace)::BasicDLLImpl::~BasicDLLImpl(this=0x0000000110e2cfa0) + 53 at basic/source/runtime/basrdll.cxx:33 > frame #41: 0x0000000111992415 libsblo.dylib`(anonymous namespace)::BasicDLLImpl::~BasicDLLImpl(this=0x0000000110e2cfa0) + 21 at basic/source/runtime/basrdll.cxx:33 > frame #42: 0x000000011199243c libsblo.dylib`(anonymous namespace)::BasicDLLImpl::~BasicDLLImpl(this=0x0000000110e2cfa0) + 28 at basic/source/runtime/basrdll.cxx:33 > frame #43: 0x000000011180c235 libsblo.dylib`SvRefBase::ReleaseRef(this=0x0000000110e2cfa0) + 197 at include/tools/ref.hxx:163 > frame #44: 0x0000000111992039 libsblo.dylib`tools::SvRef<SvRefBase>::clear(this=0x00007ffeefbf1bb0) + 57 at include/tools/ref.hxx:64 > frame #45: 0x0000000111991f0b libsblo.dylib`BasicDLL::~BasicDLL(this=0x00007ffeefbf1bb0) + 123 at basic/source/runtime/basrdll.cxx:69 > frame #46: 0x0000000111992055 libsblo.dylib`BasicDLL::~BasicDLL(this=0x00007ffeefbf1bb0) + 21 at basic/source/runtime/basrdll.cxx:66 > frame #47: 0x0000000110f07a5a libtest_basic_macros.dylib`MacroSnippet::~MacroSnippet(this=0x00007ffeefbf1ba8) + 74 at basic/qa/cppunit/basictest.hxx:23 > frame #48: 0x0000000110f07a05 libtest_basic_macros.dylib`MacroSnippet::~MacroSnippet(this=0x00007ffeefbf1ba8) + 21 at basic/qa/cppunit/basictest.hxx:23 > frame #49: 0x0000000110f269b7 libtest_basic_macros.dylib`(anonymous namespace)::VBATest::testMiscVBAFunctions(this=0x0000000100651890) + 1319 at basic/qa/cppunit/test_vba.cxx:168 [...] Change-Id: I776b7f0686e0915b69119b2e6a513e2a4b40822f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90967 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-03-24tdf#131282 sw layout: fix shifted down table next to a fly frameMiklos Vajna3-2/+24
Regression from commit fd7749fddc5a767461dfced55369af48e5a6d561 (sw: fix handling of table vs fly overlaps in the AddVerticalFlyOffsets case, 2020-02-14), the problem was that the rectangle of the fly frame included spacing when overlapping was checked. Given that this code was explicitly added for Word compat purposes, change it to ignore spacing. You can see that Word doesn't care about spacing: increase the left margin of e.g. the pie chart in the bugdoc to some large value and the table is still not shifted down. Writer shifted the table down as the small spacing was already enough to detect an overlap: debug:21457:21457: SwTabFrame::CalcFlyOffsets: aTabRange is 896 -> 3698 debug:21457:21457: SwTabFrame::CalcFlyOffsets: aFlyRange is 3650 -> 6290 If we don't include that ~3 px spacing, then we don't overlap, similar to Word. Change-Id: I154c211bb0700d132fd168f49c1bbfb29e8caeb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90939 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-24No more --disable-gtkSamuel Mehrbrodt1-1/+0
Change-Id: I80da384871f96e05e348c734a96e825f0b58278d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90925 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-03-24Sukapura: Fix for tdf#131509, change italic in Spanish to K from CRizal Muttaqin1-3/+3
Change-Id: I38aa38a095dd07ec550087712018fa1566029ce6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90945 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-03-24sw: keep the cursor visible after creating SwDrawTextShellAshod Nakashian1-1/+1
For some mysterious reason the cursor was forced to become hidden after creating SwDrawTextShell, which is used to edit the text on shapes. Doing this didn't have a negative effect on desktop, because the cursor was shown anyway at a later point. However, for LOK, the cursor was not restored. This was unexpected as the clients didn't know editing was possible (and on mobile wouldn't even show the keyboard). There doesn't seem to be any ill-effect to leaving the cursor enabled in all cases after creating an SwDrawTextShell instance. Change-Id: Ifae8d533ef48b2146a451d58d729e46f5248be71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90897 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit a50d20b114b4d418cebb968af4b40645dfac087a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90947 Tested-by: Jenkins
2020-03-24sw: check for null SdrObject before accessingAshod Nakashian1-0/+2
Change-Id: I30f1cc658450982232feea10dbe9c5bfefe07d91 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90896 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 8ed4ac6152c96280616a784b47c4f75df147501a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90946 Tested-by: Jenkins
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 03:49:58 +0000