summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-06-25unify color selectorsprivate/s.mehrbrodt/colorpicker-backportCaolán McNamara
Note: this removes the use of auto-color from writer's asian text grid, because its always invisible as far as I can see in practice. (cherry picked from commit 43bc3031483d172eccd72c3804e2d4fc2ef37de4) Conflicts: chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx chart2/source/controller/inc/dlg_View3D.hxx cui/source/inc/border.hxx cui/source/inc/chardlg.hxx cui/source/inc/cuitabarea.hxx cui/source/inc/cuitabline.hxx cui/source/inc/numpages.hxx cui/source/options/optcolor.cxx cui/source/tabpages/border.cxx cui/source/tabpages/borderconn.cxx cui/source/tabpages/chardlg.cxx cui/source/tabpages/numpages.cxx cui/source/tabpages/tpgradnt.cxx cui/source/tabpages/tphatch.cxx cui/source/tabpages/tpline.cxx cui/source/tabpages/tppattern.cxx cui/source/tabpages/tpshadow.cxx cui/uiconfig/ui/gradientpage.ui cui/uiconfig/ui/hatchpage.ui cui/uiconfig/ui/patterntabpage.ui include/sfx2/controlwrapper.hxx include/svx/PaletteManager.hxx include/svx/colorwindow.hxx include/svx/float3d.hxx include/svx/fontwork.hxx include/svx/sidebar/AreaPropertyPanelBase.hxx include/svx/svxids.hrc include/svx/tbcontrl.hxx sc/source/ui/condformat/colorformat.cxx sc/source/ui/condformat/condformatdlgentry.cxx sc/source/ui/dbgui/scendlg.cxx sc/source/ui/inc/scendlg.hxx sc/source/ui/optdlg/opredlin.cxx sc/source/ui/optdlg/tpview.cxx sc/uiconfig/scalc/ui/conditionalentry.ui sd/inc/sdabstdlg.hxx sd/qa/unit/dialogs-test.cxx sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/dlg/copydlg.cxx sd/source/ui/dlg/sddlgfact.cxx sd/source/ui/dlg/sddlgfact.hxx sd/source/ui/func/fucopy.cxx sd/source/ui/inc/copydlg.hxx sd/source/ui/sidebar/SlideBackground.cxx sd/source/ui/sidebar/SlideBackground.hxx sd/uiconfig/simpress/ui/sidebarslidebackground.ui svtools/source/control/ctrlbox.cxx svx/source/dialog/bmpmask.hrc svx/source/dialog/bmpmask.src svx/source/dialog/fontwork.cxx svx/source/engine3d/float3d.cxx svx/source/sidebar/area/AreaPropertyPanelBase.cxx svx/source/sidebar/shadow/ShadowPropertyPanel.cxx svx/source/sidebar/shadow/ShadowPropertyPanel.hxx svx/source/tbxctrls/PaletteManager.cxx svx/source/tbxctrls/tbcontrl.cxx svx/uiconfig/ui/sidebararea.ui sw/source/ui/config/optpage.cxx sw/source/ui/frmdlg/column.cxx sw/source/ui/misc/pgfnote.cxx sw/source/ui/misc/pggrid.cxx sw/source/uibase/inc/column.hxx sw/source/uibase/inc/optpage.hxx sw/source/uibase/inc/pgfnote.hxx sw/source/uibase/inc/pggrid.hxx sw/source/uibase/sidebar/PageStylesPanel.cxx sw/source/uibase/sidebar/PageStylesPanel.hxx sw/uiconfig/swriter/ui/optredlinepage.ui sw/uiconfig/swriter/ui/pagestylespanel.ui Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e
2018-06-25let menu button launch arbitrary floating windowsSamuel Mehrbrodt
and not just menus, this is like how the gtk equivalent can launch popovers (cherry picked from commit 4b7435e31ac821d1738eda23a6688461efcbd311) Change-Id: I53ae96aab0c51d75405dba15ab8080d7315471e3
2018-06-25rename SvxColorWindow_Impl to SvxColorWindowSamuel Mehrbrodt
(cherry picked from commit 4778444d20e5396d012164603018fa968331e012) Change-Id: I84941f4566792e11a9070f8623857a3fac44591d
2018-06-25Split some stuff from ToolbarMenu to a base classSamuel Mehrbrodt
i.e. implement "todo: move to new base class that will replace SfxPopupWindow" Change-Id: I1b300e1e0c6423bf27d9dae7d75703b988afb154
2018-06-22poppler: poppler-snprintf.patch.1 needs rebaseMichael Stahl
Presumably it's needed for MSVC 2013. Change-Id: Ibcd3bab373616faa58db4dab0f92f058d1dfafac Reviewed-on: https://gerrit.libreoffice.org/56274 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21poppler: upgrade to release 0.66.0Michael Stahl
Unfortunately the autotools build system was removed in 0.60.0, and the CMake one is a bit overeager in linking against system libraries that happen to be installed on the build machine, and we currently don't require CMake anyway, so avoid the problems by using a gbuild makefile and a patch to add the generated header files. Remove all current patches: poppler-notests.patch.1: obsolete (autotools build system) poppler-mac-fake.patch.1: presumed obsolete ubsan.patch.0: presumably fixed differently upstream in https://cgit.freedesktop.org/poppler/poppler/commit/?id=f43cb73939f85952d83afc87a6dc638dc1ae311b poppler-libjpeg.patch.1: obsolete (autotools build system; there appears to be no way to do this with CMake?) 0001-Fix-building-with-old-clang.patch.1: merged upstream Change-Id: I271c87ab3ec25cc9d1e8fafb04dae7c004acc350 (cherry picked from commit 5f8426a077ec0986a4b6cf8a58515ad5496f78e0) Reviewed-on: https://gerrit.libreoffice.org/56259 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21fix build with poppler 0.64Rene Engelhard
GooString became const... Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5 (cherry picked from commit 42cebff14f7d486c20f04863681cc5ef4602f4eb) Reviewed-on: https://gerrit.libreoffice.org/56258 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21Allow building with poppler-0.62Dominique Leuenberger
Change-Id: Ia627f1628a67dd8ece7d9318639d9ccd06b89765 Reviewed-on: https://gerrit.libreoffice.org/47460 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 38368be8527ca655854ee1231d9f355b8c0591ec) Reviewed-on: https://gerrit.libreoffice.org/56257 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21upload poppler 0.59.0David Tardon
Change-Id: I21dfa3aa04bd960cb2fb87a53213ae4bbd510a24 Reviewed-on: https://gerrit.libreoffice.org/42061 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 1c983335116a6f09cabf0b3eae7f51951111341e) Reviewed-on: https://gerrit.libreoffice.org/56256 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21upload poppler 0.55.0David Tardon
Change-Id: I19b7d324a2dc50d006b4d255ddb6a5c1f15bc616 Reviewed-on: https://gerrit.libreoffice.org/37998 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b12e16f8fc186117cbb20cc3866bf052a3d75515) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 51775f495f0399177edbcabb2ad881cdd9f57e0f) Reviewed-on: https://gerrit.libreoffice.org/56255 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21upload poppler 0.49.0David Tardon
Change-Id: I98508a1a2b57c7b39d5be3bf216271001b6a0427 Reviewed-on: https://gerrit.libreoffice.org/31111 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 6f1ae11761ddfa2f928254ff51f1860155f670a4) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b1d30ac04e95e72883c759110df6d5e46ce94510) Reviewed-on: https://gerrit.libreoffice.org/56254 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21poppler: remove obsolete ubsan patch hunkMichael Stahl
With eea709f67d91e271e3df37e6c6724b7b5870b1ee "poppler: build against libjpeg" the poppler internal JPEG code is no longer used. Change-Id: I018a53a495ec505af92bb9b1c1a0c42e0a4f35b8 (cherry picked from commit 21ca0db5ec27662a3e047d7547eae9beb87b0b01) Reviewed-on: https://gerrit.libreoffice.org/56253 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21upload poppler 0.48.0David Tardon
Change-Id: I18c49505f71ab609e5cc0e4db759152c3c1d5825 (cherry picked from commit dc522a114d24ad7c550c072d4f29f50a62260b77) Reviewed-on: https://gerrit.libreoffice.org/56252 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-21external/poppler: Avoid UBSan warning about undefined downcastStephan Bergmann
...of this-ptr of in-construction FormFieldSignature while still in the base FormField ctor, as happens (in the xpdfimport process) during CppunitTest_xmlsecurity_signing: > Form.cc:448:12: runtime error: downcast of address 0x60f000000040 which does not point to an object of type 'FormFieldSignature' > 0x60f000000040: note: object is of type 'FormField' > 03 00 00 6d 50 84 f2 00 00 00 00 00 03 00 00 00 04 00 00 00 00 00 00 00 01 be be be 07 00 00 00 > ^~~~~~~~~~~~~~~~~~~~~~~ > vptr for 'FormField' > #0 0x73d7f4 in FormWidgetSignature::FormWidgetSignature(PDFDoc*, Object*, unsigned int, Ref, FormField*) workdir/UnpackedTarball/poppler/poppler/Form.cc:448:12 > #1 0x741713 in FormField::_createWidget(Object*, Ref) workdir/UnpackedTarball/poppler/poppler/Form.cc:677:34 > #2 0x73e747 in FormField::FormField(PDFDoc*, Object*, Ref const&, FormField*, std::set<int, std::less<int>, std::allocator<int> >*, FormFieldType) workdir/UnpackedTarball/poppler/poppler/Form.cc:547:7 > #3 0x74ec2b in FormFieldSignature::FormFieldSignature(PDFDoc*, Object*, Ref const&, FormField*, std::set<int, std::less<int>, std::allocator<int> >*) workdir/UnpackedTarball/poppler/poppler/Form.cc:1383:5 > #4 0x740d7f in Form::createFieldFromDict(Object*, PDFDoc*, Ref const&, FormField*, std::set<int, std::less<int>, std::allocator<int> >*) workdir/UnpackedTarball/poppler/poppler/Form.cc:1700:19 > #5 0x750727 in Form::Form(PDFDoc*, Object*) workdir/UnpackedTarball/poppler/poppler/Form.cc:1623:33 > #6 0x71d440 in Catalog::getForm() workdir/UnpackedTarball/poppler/poppler/Catalog.cc:1042:18 > #7 0x708572 in Annots::createAnnot(Dict*, Object*) workdir/UnpackedTarball/poppler/poppler/Annot.cc:7218:41 > #8 0x70772b in Annots::Annots(PDFDoc*, int, Object*) workdir/UnpackedTarball/poppler/poppler/Annot.cc:7128:17 > #9 0x87f3e9 in Page::getAnnots(XRef*) workdir/UnpackedTarball/poppler/poppler/Page.cc:405:18 > #10 0x8814b0 in Page::displaySlice(OutputDev*, double, double, int, bool, bool, int, int, int, int, bool, bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) workdir/UnpackedTarball/poppler/poppler/Page.cc:611:15 > #11 0x880ff6 in Page::display(OutputDev*, double, double, int, bool, bool, bool, bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) workdir/UnpackedTarball/poppler/poppler/Page.cc:521:3 > #12 0x88d906 in PDFDoc::displayPage(OutputDev*, int, double, double, int, bool, bool, bool, bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) workdir/UnpackedTarball/poppler/poppler/PDFDoc.cc:491:20 > #13 0x5d59fb in main sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx:142:14 > #14 0x7f11600ea730 in __libc_start_main (/lib64/libc.so.6+0x20730) > #15 0x459388 in _start (instdir/program/xpdfimport+0x459388) Change-Id: Ia808919c8d2363d616feb4664f314a77b40dfbb8 (cherry picked from commit 55013a7776a43bb18b7fb8faa1839369c3383cb7) Reviewed-on: https://gerrit.libreoffice.org/56251 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-20Don't load UI when running in unit testsSamuel Mehrbrodt
There seems to be some exception for testFdo77229 that IsHeadlessModeEnabled returns false. So add another check here. Follow-up for c6dbeee59fa4fd8b43f3ae182c18bf04d57c52dc Change-Id: I023791bc9c8e1168abb943dc706c7fc8c17671b8
2018-06-19tdf#118238 Only disable UI interaction when loading document as hiddenSamuel Mehrbrodt
The "quiet" interaction handler was used unconditionally when loading a document via the loadComponentFromURL API method. So no dialog was shown asking the user whether he wants to enable macros. With this patch, the "quiet" interaction handler is only used, when the document was loaded with the "Hidden" property set. Change-Id: Idd522d0bf605499b071390fb58312181b755dfca
2018-06-18MM don't keep undo informationJan-Marek Glogowski
Doen't make much sense to store undo information for all merge based progress. Actually it even prevents crahes when undoing a merged ODT document. Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Ic3a3982f3e5eb4f6de9f027a6a5e376c2833e8a5 Reviewed-on: https://gerrit.libreoffice.org/56023 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-13Build kde-integration for '--enable-gtk3-kde5' as wellMichael Weghorn
The relevant files ('libvclplug_gtk3_kde5lo.so', 'lo_kde5filepicker') resulting from the '--enable-gtk3-kde5' build option are put into the kde-integration package (e.g. a Debian package when the '--with-package-format=deb' option is given). However, so far that package was only created at all when one of the options '--enable-kde4', '--enable-qt5' or '--enable-kde5' was given in addition. Since those are not needed for the gtk3_kde5 vclplug, also build the kde-integration when none of the others is built in addition. Reviewed-on: https://gerrit.libreoffice.org/55310 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit f971bdb026735fdecd777d0d2edc515124f9e822) Conflicts: scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk Change-Id: I86eb71ac7879c7226c9eaa89774b68125212a75c Reviewed-on: https://gerrit.libreoffice.org/55738 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-13tdf#117276 filter reset: check complete data range selectedSerge Krot
Reviewed-on: https://gerrit.libreoffice.org/55436 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Conflicts: sc/source/ui/view/gridwin.cxx Change-Id: I5cbd515753ad606f55cedaa7023ffe88671f4702 Reviewed-on: https://gerrit.libreoffice.org/55720 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-12tdf#118113 MM: Make sure page count is up to dateMichael Weghorn
Since the page layout may have changed, e.g. due to the visibility status of hidden sections having changed in the call to 'pWorkShell->SwViewShell::UpdateFields()', it's necessary to recalculate the layout to ensure that the correct page count is retrieved when calling 'pWorkShell->CalcLayout()'. This fixes a regression introduced by the performance optimization done in commit ae5afe9bcebdd220a457829d47882fe8a0cf69fd, while still avoiding to have to do the expensive layout for the target document. Change-Id: I46f1b68758e4df330c17358a8e852e8b040a9520 Reviewed-on: https://gerrit.libreoffice.org/55636 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 89f896d2cfd84b711583f98a6343e9835a9aed11) Reviewed-on: https://gerrit.libreoffice.org/55699 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-06-08tdf#62268: allow row height recalculation on document loadVasily Melenchuk
During document load rows with style:use-optimal-row-height="true" should recalculate it's height. Reviewed-on: https://gerrit.libreoffice.org/52521 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: sc/qa/unit/subsequent_filters-test.cxx sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlrowi.cxx Change-Id: Ib38b5b753d9ff8352116d77851d228c5d77bd530
2018-06-01Patch liborcus to avoid incorrect parsing of XML.Kohei Yoshida
Found by Antti Levomäki and Christian Jalio from Forcepoint. This one is not a backport from the master branch. On the master branch the same fix will come from updating liborcus from 0.13.3 to 0.13.4. (cherry picked from commit 160350de5f07024b22fb5a9b596918ccc7f22c75) Conflicts: external/liborcus/UnpackedTarball_liborcus.mk Reviewed-on: https://gerrit.libreoffice.org/50147 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit f25bc1254782589af5d24471599260b65558154a) Conflicts: external/liborcus/UnpackedTarball_liborcus.mk Change-Id: I701c5a65ff67d77767913f8d056682b9db549f84
2018-06-01curl: fix CVE-2018-1000005/1000007Michael Stahl
* don't upgrade to new release, no idea how the new windows build system likes targeting Win XP which is still supported in 5.4 Change-Id: I4fbd7f1c5f1f0563895f6f8ede10063621d10a4b Reviewed-on: https://gerrit.libreoffice.org/48542 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit ed497921314ebd41fce3483c92ca433b502628ca)
2018-06-01curl: fix CVE-2017-8816Michael Stahl
* don't upgrade to new release, no idea how the new windows build system likes targeting Win XP which is still supported in 5.4 * CVE-2017-8817 doesn't affect LO as CURLOPT_WILDCARDMATCH isn't used * CVE-2017-8818 doesn't affect the old 7.52 version Change-Id: I49ddb771ccdb93d5fe8f4b3544f74ab9b171c156 Reviewed-on: https://gerrit.libreoffice.org/45487 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit aa0f44de5b260b2b2a39bdd2de9445d72ab14265)
2018-05-30tdf#117847 Impress: Deselected alignment remained checkedIlhan Yesil
The state of the attributes for alignment are now read and set correctly. Reviewed-on: https://gerrit.libreoffice.org/54907 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 07610feeeff47fc5bbe057c91c50ffae54a41c85) Conflicts: sd/source/ui/view/drtxtob.cxx Change-Id: I65047dac341729154ded0d5b01ace1207893a5ba Reviewed-on: https://gerrit.libreoffice.org/55083 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-25set Referer on link mediadescriptorCaolán McNamara
to allow determining if the source document is from a trusted/untrusted location Reviewed-on: https://gerrit.libreoffice.org/53693 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit cd25a97bbadc0a5c1fd6b0e8603c8b6ebd051926) Reviewed-on: https://gerrit.libreoffice.org/53803 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2d87c267267530077a94c894bc619831b01d1c04) Conflicts: sw/source/filter/xml/xmltexti.cxx Change-Id: I780568652d2ef0cc8543c27ba26289277b5d9d0c
2018-05-22remove page count check in a test (irrelevant and fragile)Luboš Luňák
If I load this document in LO, either my build or distro build, it has only one page, so the test fails for me only because of the 2-page check. The commit causing this, b904d639a8, has been in for quite a while, so it's apparently something special about my setup, but a) the test doesn't actually require 2 pages for anything, b) the commit mentions that the test is fragile, c) if I manually inspect the .rtf, there's an extra page that I do not see even in Word2013, so the document is possibly a bit broken. One way or another, the page check seems pointless. Change-Id: I18bdf25f71e8eb9225acd667e60f426fca008ee4 Reviewed-on: https://gerrit.libreoffice.org/53380 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 6154d04d90b7b4f68e6c3629bf0c6306ef64a937)
2018-05-22tdf#97231: basic: do not use extra wrapping for string marshalingVasily Melenchuk
previous approach did wrap string reference once again, making practically "a pointer to pointer to string" so this code was not working correctly for RegQueryValueExA WinAPI call. String is already provided as a reference (see marshalString(), so no reason to wrap its reference. This approach was just copied from from dllmgr-x86.cxx plus some minor changes to make both versions similar. Reviewed-on: https://gerrit.libreoffice.org/54645 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: basic/source/runtime/dllmgr-x64.cxx Change-Id: I85065112407de3f078265d2c76437814402eb1b3
2018-05-21tdf#97231: potential crash fixedVasily Melenchuk
blob2 pointer can be invalidated during marshalString() call, because it also adds new element in data vector and thus later access to blob2 can cause crash. Change-Id: I2de519c363193f34b249e7250a016397b7420882 Reviewed-on: https://gerrit.libreoffice.org/54613 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit de9620dd4539397715dab3102d256f9d634fcb23) Reviewed-on: https://gerrit.libreoffice.org/54637 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-18Find Java 9 with the new registry keys on WindowsStephan Bergmann
See <https://docs.oracle.com/javase/9/migrate/toc.htm#JSMIG-GUID-EEED398E-AE37- 4D12-AB10-49F82F720027> section "Windows Registry Key Changes". Reviewed-on: https://gerrit.libreoffice.org/49792 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit cc8e8215c8d7583f36feca20f0a1235edc05a6d7) Conflicts: jvmfwk/plugins/sunmajor/pluginlib/util.cxx Change-Id: Ic30ce430663cc1608c6268fa937142f73c55f138 Reviewed-on: https://gerrit.libreoffice.org/54533 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-18Adapt external/beanshell to Java 9Stephan Bergmann
For one, drop a spurious target="1.5" so that ant instead uses the passed-in JAVA_TARGET_VER (which needs to be 1.6 for Java 9). For another, the deprecated java.awt.Component.getPeer method finally got removed, so bsh.util.AWTConsole would no longer compile. But it looks like that class is not used by us anyway, so just remove the problematic code. (workdir/UnpackedTarball/beanshell/docs/manual/bshmanual.html: "Web Browser Access: After starting the server you can connect your web browser to the port you specified. BeanShell will respond by sending an HTML page offering you a choice of the Swing based JConsole or the older AWTConsole. You may choose whichever is appropriate for your web browser. [...] The bsh.util.AWTConsole is a legacy implementation of the GUI Console using AWT instead of Swing. This console does work, but it is not as slick or pretty as the JConsole. The primary reason it is still here is to support remote access from generic web browsers using only Java 1.1.") Change-Id: I9f1112caebae9a55e4eec7f9baa0114b2254ccda (cherry picked from commit f20810a1318a8dd55cb01e42a0fde7f0e1b36623) Reviewed-on: https://gerrit.libreoffice.org/54532 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-18This hunk breaks jdk9 buildFridrich Štrba
Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90 (cherry picked from commit 57adce8b88073b813aacb668629968f29b7d706a) Reviewed-on: https://gerrit.libreoffice.org/54531 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-18Detect libjawt automatically on java9 tooFridrich Štrba
Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81 (cherry picked from commit 047b4c14ada038204a1e1280742960db00a5d1f2) Reviewed-on: https://gerrit.libreoffice.org/54530 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-18GCC 7 supports [[fallthrough]]Stephan Bergmann
Change-Id: Ic6fb995a76a30b60b597005e714de03d43c36a7c (cherry picked from commit 9ee0f108ca104ec76d2d73220686fb10c89e78e8) Reviewed-on: https://gerrit.libreoffice.org/54529 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-17tdf#117668 Fix wrong number of sections in documentSerge Krot
Change-Id: Ia2b8a1376f4f2b4e790598255ae69fb6ee92d23d Reviewed-on: https://gerrit.libreoffice.org/54423 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 27c9370b5fd00b851582e4163907656286e8c581) Reviewed-on: https://gerrit.libreoffice.org/54485
2018-05-17tdf#117664: mailmerge: copy printer settings to new mailmerge documentVasily Melenchuk
Created mailmerge output document was not using current printer settings, which can be taken not only from settings, but overriden by currently opened template. Reviewed-on: https://gerrit.libreoffice.org/54358 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Ic127dcbfbe8f1e80073b06ecb399100344f4c01d
2018-04-30Fix: nNodeCnt could be set to negative valueSerge Krot
Change-Id: I82e9b150e97e733c4063f7498dc026e0c9f903c0 Reviewed-on: https://gerrit.libreoffice.org/53660 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-04-24tdf#116990 Unwanted line breaks if ODS export to XHTMLAndreas Brandner
Change-Id: I86cc48d74f0572a7ba18beabbaf307bcaa069d38 Reviewed-on: https://gerrit.libreoffice.org/53087 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/53409
2018-04-24Prevent crash while loading conditional formattingSamuel Mehrbrodt
Manually cherry-picked from 2b0ff1adeb13efbf7fb0f46939738e3f895d7caf Change-Id: I48734ebdeab552f9f071dbd92ca9b286006cb075
2018-04-24coverity#1425723 silence 'Wrapper object use after free'Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/46035 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 05f97ef127ec6ee0cc159fc74b4fecc34d9c684c) Change-Id: Ibcc0e5f28910bdd15c94579d754de3698ac8beb1
2018-04-24Don't leak formats that get mergedMike Kaganski
ea55492a6e55290d92a59324b3cb31ed958981ab follow-up Change-Id: Ib94a5a2c2ef6ebc7552c67975683dc18a9a5a744 Reviewed-on: https://gerrit.libreoffice.org/45723 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 8c89cfe3cdf6595d5f3bb87ecc45b9f450195aac)
2018-04-21forcepoint #33 ensure payload is a EMFPPathCaolán McNamara
Change-Id: I0a9f332cc66e43caa4e1611006fa765cad063539 Reviewed-on: https://gerrit.libreoffice.org/51916 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-04-21forcepoint #34 survive missing autostylesCaolán McNamara
Change-Id: I742816297659d614e836a8d5e8965b1c55154719 Reviewed-on: https://gerrit.libreoffice.org/51892 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21forcepoint #32 survive missing value rangeCaolán McNamara
Change-Id: I90315f0481bf73c4d9071959bf5408f4a2690257 Reviewed-on: https://gerrit.libreoffice.org/51886 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21forcepoint #31 check validity of another group rangeCaolán McNamara
Change-Id: I82ff3e47a033c91581b108e1685b1ff4d5865895 Reviewed-on: https://gerrit.libreoffice.org/51883 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21forcepoint #31 survive missing control modelCaolán McNamara
Change-Id: I37e4af560b46b4f6d9e0b87fe58493818f366d3c Reviewed-on: https://gerrit.libreoffice.org/51878 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21forcepoint #32 survive missing emf pathsCaolán McNamara
Change-Id: Ic27c3bbac12f66b30ff2f30f558180127cc73a51 Reviewed-on: https://gerrit.libreoffice.org/51876 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-04-21forcepoint #30 check validity of group rangeCaolán McNamara
Change-Id: Ie0611f36809b051ce46030e44c137b4e1f8d2fe0 Reviewed-on: https://gerrit.libreoffice.org/51865 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21forcepoint #29 detect illegal self series addCaolán McNamara
Change-Id: I3bba0f942780c54951a3a810c05cc3b56ca18a5e Reviewed-on: https://gerrit.libreoffice.org/51862 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21forcepoint #28 missing cell on abw importCaolán McNamara
Change-Id: I7633a17afab5aa2eb9e47a552bd5d92c87d383c7 Reviewed-on: https://gerrit.libreoffice.org/51853 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
generated by cgit (git 2.34.1) at 2024-05-04 15:30:42 +0000