summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-06GenericCommands: fix Fontwork tooltipsJustin Luth
These were terribly confusing. .uno:Fontwork does NOT insert fontwork text, despite the tooltip name. It opens up the old fontwork dialog that modifies contour properties so that the text can flow along the contour. The UIname is Fontwork, so lets have an automatic tooltip for that. .uno:FontworkGalleryFloater has a UIname of "Fontwork Style", but the auto-generated tooltip was "Fontwork". (Notice that this conflicts with the UIname of the other one. So when you add "Fontwork" to your toolbar, and chose the icon with the tooltip "Fontwork" you get a different item.) Since this one actually inserts text, and doesn't actually modify any existing style (that's the function of Fontwork Shape), lets give this one the tooltip "Insert Fontwork Text". Therefore, this patch effectively switches the two tooltip names around, which much better matches their function, and their UIname. I expect that this was the original 2016 intention anyway... At the end, I decided to also change the UIname to "Insert Fontwork", since the gallery is normally added to insert menus... The unit test I had to modify just looked like a functionality test and had nothing to do specifically with the label's string. (It was last changed for tdf#91781 which made no specific reference to fontwork.) This might help documentation bug tdf#118336 a bit too. Change-Id: I152596781def2d8dba47f53e345976543e3131bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88101 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
2020-02-06gb_CppunitTest__use_java_ure can be private againStephan Bergmann
...(which it already was until 1f6e670605cc856a6e9febb024f9cb2427156020 "gbuild: require java UNO runtime explicitly"), as 2a87b3b5aed8296a7506374fd5324c5659a88cb5 made that implicitly called from gb_CppunitTest_use_jar(s), so its (sole outside) use in postprocess/CppunitTest_services.mk is redundant Change-Id: I9928521d184c54688de134ff3b9b5743ba3509c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88134 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06Fix mis-mergeStephan Bergmann
d4b1d9b75572fdcc55a925254943a3cf29354f98 "sb123: #i111655# when, within build env, calling javaldx within OOo installation sets, set UNO_JAVA_JFW_ENV_JREHOME, but not UNO_JAVA_JFW_ENV_CLASSPATH" had removed the -env:UNO_JAVA_JFW_ENV_CLASSPATH=true arg, but 8c59580b88a33d7f0c892c9c53776716ad661fcf "Merge commit 'ooo/DEV300_m101' into integration/dev300_m101", in what looks like an accidental mis-merge, brought it back Change-Id: If2313642a1a737c9711fb36dcab5c340bf7dcecb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88133 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06Remove correctly formatted files from the clang-format blacklistMuhammet Kara
Change-Id: I80554560d55601ece243620a11dc2931144c7e52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88132 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-02-06weld ClassificationControl ToolboxWindowCaolán McNamara
Change-Id: Idda0b5187201aa77b5b6d682b740a8e55719742a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88129 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06always define GLM_FORCE_CTOR_INIT when using glmCaolán McNamara
Change-Id: I2a4ed756c6d18937d2c720243652df7a2d629959 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88121 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06tdf#130462 call SetMinOutputSizePixel before SetOutputSizePixelCaolán McNamara
Change-Id: I04716e91b7c9b5f1e9db1fd175f5dcbe0600bf1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88115 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06fix "Use data for document properties" checkbuttonCaolán McNamara
regression since... commit 3a15c034be9f557f350d0ba1f3a842151066eaae Date: Tue Mar 12 09:59:35 2019 +0000 weld SvxGeneralTabPage Change-Id: I7c4624255f70c3f0c4ccd4b79ebae7750ed2bbe9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88108 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06Typo fix.Michael Meeks
Change-Id: Id638f16f522b335ca9af7a805556f2061df55bf4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88111 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-02-06lok: calc: formula input bar: set text selection as requested by clientMarco Cecchetti
Change-Id: If04ed3c1637249329530a73d20df9b9296d1004e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88089 Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com> Tested-by: Marco Cecchetti <marco.cecchetti@collabora.com> (cherry picked from commit 01f0d42f5ca9fb0e6e45b7bfcf51cb33c1a27bec) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88117 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-06Missing test dependencyStephan Bergmann
...for CppunitTest that use Java, like CppunitTest_dbaccess_hsqldb_test failing with something like > warn:jfw:2880195:2880195:jvmfwk/source/fwkbase.cxx:94: [Java framework] A vendor settings file was not specified.Check the bootstrap parameter UNO_JAVA_JFW_VENDOR_SETTINGS. > warn:jfw:2880195:2880195:jvmfwk/source/framework.cxx:582: [Java framework] A vendor settings file was not specified.Check the bootstrap parameter UNO_JAVA_JFW_VENDOR_SETTINGS. because the jvmfwk3 ini file is missing from instdir. (Should those tests also set UNO_JAVA_JFW_ENV_JREHOME=true, as is done in unotest/source/cpp/officeconnection.cxx and unotest/source/java/org/openoffice/test/OfficeConnection.java?) Change-Id: Iabf1198246c17410e71d5b85454662ff85a7b478 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88112 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06DOCX export: fix handling of section starts that originally had headersMiklos Vajna
Both the DOC import (in wwSectionManager::InsertSegments()) and DOCX import (in SectionPropertyMap::CloseSectionGroup()) have a mechanism to try to attach changed headers/footers from a continuous section break somewhere, so they are not lost. This means that even if the rendering of such documents is OK, explicit code is needed to undo the effect of the importer at export time, or those headers will be lost. Start doing this for the DOCX export case when the headers/footers are placed at the "previous-in-practice" paragraph, more cases (handled at the import side) can be added later. Change-Id: Ic2304a74919d18da3ba9cb4afe301e0247a50dc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88103 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-02-06Fix typoAndrea Gelmini
Change-Id: I8ece4e0ea5ba4756a6b0f9d87ccf1451290a7adc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88119 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2020-02-06drop duplicate line in custom_widgets listCaolán McNamara
Change-Id: Id2b8c36e2dd4c7ab6b4158c40b85ec8c13dd6b6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88107 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06weld SvxMetricFieldCaolán McNamara
split off SdPagesField as its not really a MetricSpinButton and can be a SpinButton with a custom output function. while I'm at it use ngettext to provide better plurals for the output. Change-Id: Idc9ce0513c9fce60c8713c7361fd40f0dbd01f64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88100 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06cid#1458159 Dereference after null checkCaolán McNamara
Change-Id: I5ec0f9571f3b551e716899cc86a57c2c91369641 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88083 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06no FontNameBox exists in any .ui file anymoreCaolán McNamara
Change-Id: I9ca3a4da0cd9bcc2b528d5c761a55efd2a4de2f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88106 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06the svtlo-FontNameBox entries are hiddenCaolán McNamara
and nothing interacts with them so they can be removed from the notebook .ui without effect Change-Id: I85e46ee8539e83776c4ce107a715d9eeccf6222c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88105 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06ofz#20523 timeout, don't generate undo data during importCaolán McNamara
Change-Id: Id56901a6bf4da7bc8fbdcbcc811f6afb2121fe07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88015 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06rename nFirstLineOfst -> nFirstLineOffsetNoel Grandin
Change-Id: Ic56453d5bffe5b0c0edd354bbaa2c3e78db52a13 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88026 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-06tdf#129881 missing sections in link sectionNoel Grandin
actually this is a regression from commit 2b77d9dba51e1c3841428f3343e9186ca9c446ae Date: Wed Nov 6 11:19:12 2019 +0200 convert SwXMLSectionList to FastParser the commit mentioned in the bug report was fixed by caolan, and then I broke it again with the above commit Change-Id: If6d3dad7baadcdfcc73d87d1e9d6a91c9f65a6e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88019 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-06backport glm v0.9.9.0 fix for libetonyekCaolán McNamara
Change-Id: Id21bd6f5c80e79cad653093090a96d066c56c7e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88092 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06No more need to add unoil.jar to URE_MORE_JAVA_TYPESStephan Bergmann
...after ae855bf48163ff64d94cfc34aff8e37abdb5518d "tdf#117331 Merge jurt and unoil into ridl" Change-Id: Idf640b8c3bb9d8a19e26d494498b9902a75f4e64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88053 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06cid#1458158 Dereference before null checkCaolán McNamara
Change-Id: I6fbcbce28cbd472a48556ba107e604a09c8cbe30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88081 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06Resolves: tdf#130340 null deref when nothing selectedCaolán McNamara
Change-Id: Ie406006cbcca566ddd32fd86a7e88f0c754dd02e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88047 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06cid#1458157 Dereference before null checkCaolán McNamara
Change-Id: I36317f40a789cfb5915bd92cca75c01e4e53a782 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88082 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06cid#1458160 Dereference before null checkCaolán McNamara
since... commit 6e2ed4ea934851f82611c3352b9551046fda89d0 Date: Mon Jan 20 11:55:02 2020 +0300 sw: set unique name for fontwork object and style on insertion Change-Id: I0030425c77bba9a8fe720002114c2b9076c93c4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88078 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06use forward declCaolán McNamara
Change-Id: I21b70a405a6c5a62bc3d0f16c4a1b3f7d72c0dd0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88068 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06merge FillTypeLB with SvxFillTypeBoxCaolán McNamara
Change-Id: Ia6229e8cc04c88e6740a12648c50cf5efca3bbd0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88067 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06drop unnecessary includeCaolán McNamara
Change-Id: Ifb7e34d5648238a1cf0a893a6713671fa6881161 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88066 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06rename SvtFontSizeBox back to FontSizeBoxCaolán McNamara
Change-Id: I2ec0c6dd376f3a192a62dc97f7454af946e2a5ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88065 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06sw: read-only/protected content dialog was missing on Delete/BackspaceMichael Stahl
If SwWrtShell::DelRight()/DelLeft() are called without an active selection, they select 1 character to the right/left, but then they don't check if the selection is read-only, so then SwEditShell::Delete() calls HasReadonlySel() and silently returns. Pop up the dialog in this case too, for consistency. Change-Id: I3d72f136f4d132de3f8a6f3cc2aab493ced95a28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88055 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-06tdf#45589 sw: don't paint field shading for bookmarksMichael Stahl
Maybe it looks better without. Change-Id: Id603fbef361574cafbe2ec9f625ac54fea27a0f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88039 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-06These tests don't need gb_JunitTest_use_jar_classset,*,jurtStephan Bergmann
(as discussed in the commit message of ae855bf48163ff64d94cfc34aff8e37abdb5518d "tdf#117331 Merge jurt and unoil into ridl") Change-Id: Ib1a46726b90a982ee5a0e2edd10096e14d434032 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88075 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06drop newly unused FontSizeBoxCaolán McNamara
Change-Id: I8a84ce74888e1d3c468251ddd3633aedf6339a11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88064 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06weld SvxFontSizeBox_ImplCaolán McNamara
which enables making a native gtk widget a member of a toolbar This widget wants to distinguish between a value getting selected by the menu or not, which is fairly tricky Change-Id: I9014785530bd0d82ffa66842f940feb2d3237e68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87971 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06return true to show pressing tab was consumedCaolán McNamara
to move focus to another toolitem Change-Id: I12f8602dd9a963c1e84e46bad780cc3c7dbe427d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88045 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06svtlo-FontSizeBox now appears in no .ui fileCaolán McNamara
Change-Id: I711a5d1b7a6ced113ac0c671ea1ba868d70d6346 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88063 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06rename nPropFirstLineOfst->nPropFirstLineOffsetNoel Grandin
Change-Id: I4a51d84131eda55f80e9e3932a8bf8290e1c27c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88025 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-06Fix typo in call to gb_CppunitTest_use_java_ureStephan Bergmann
...which had been renamed from gb_CppunitTest__use_java_ure in 1f6e670605cc856a6e9febb024f9cb2427156020 "gbuild: require java UNO runtime explicitly", apparently forgetting to adapt this use Change-Id: Ia093fcf2a5728247c259e549722329ade7b60931 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88052 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06These JunitTests can be plain check, not subsequentcheckStephan Bergmann
For one, JunitTest_typedesc and JunitTest_uno don't use qadevOOo at all. And for another, even for JunitTest_util (which does use qadevOOo), in gbuild it is OK (and frequently used) for a check target in one module to have dependencies on higher modules. Change-Id: I6f6339fa516eb8582d88ada50fabe56784d99dda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88058 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06Be more verbose about JNI errors at least with --enable-dbgutilStephan Bergmann
("The Java Native Interface" by Sheng Liang, Addison-Wesley 1999, states on page 211: "This function [ExceptionDescribe] has the side effect of clearing the pending exception." And since Java 10, the documentation of ExceptionDescription at <https://docs.oracle.com/javase/10/docs/specs/jni/ functions.html#exceptiondescribe> states that "[t]he pending exception is cleared as a side-effect of calling this function", even though for Java 8 <https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html# ExceptionDescribe> does not mention that. So assume that calling ExceptionDescribe always makes calling ExceptionClear superfluous.) Change-Id: I4f89eb44768d436a224d7027afb5e7a93f092f29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88050 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06Log swallowed exceptionStephan Bergmann
Change-Id: I6797600b5a661b478c4d9f4e0ad837f961d1fc5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88046 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06Self-certify LibreOffice licenses as OSI-approvedThorsten Behrens
Change-Id: I094217fa1f43b6eed9020c97fde07e4b413aef31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87998 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-02-06CppunitTest_oox_shape: remove unused includesMiklos Vajna
Change-Id: I00f7b042779aa981a5a6390c02f6f4ede59f3c89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88061 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-06Revert "upgrade to latest glm"Stephan Bergmann
This reverts commit 494092dc0c2f6fd04dbd973d6f76f1df720dbcf7. For reasons that are still unclear, it appears to be the cause for CppunitTest_vcl_pdfexport often (but not always) failing in Windows debug buidls, both --disable-64-bit and --enable-64-bit. At least the 32 bit builds seem to all fail with > Assertion failed: false && "out of range", file ...\include\tools/bigint.hxx, line 146 Change-Id: I472a83fa709e79f7a6bf00b118c041cbc7500e6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88069 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06the "grouped" notebook svtlo-FontSizeBox's are all hiddenCaolán McNamara
they don't appear in the notebook and there is nothing actually using them Change-Id: I570f156e937f1cbc12620da17d684e66c063425f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88062 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06DOCX import: don't give up on floating tables in headers completelyMiklos Vajna
This reverts commit 213d6390a2cc59d174173f4359c161625a9c4bdc (tdf#108272 DOCX table-only header: fix SAX parser error, 2020-02-03), except its testcase and replaces it with a better fix that does not import all floating-table-in-header as non-floating tables. See the new testcase, which is 1 pages in Word, it was 3 pages in Writer, and with the better fix it's now 1 pages in Writer as well. Change-Id: Ica3500120f12222d7cf766d55c17d78164865026 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88037 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-02-06Nothing should link against unoil.jar any moreStephan Bergmann
...after ae855bf48163ff64d94cfc34aff8e37abdb5518d "tdf#117331 Merge jurt and unoil into ridl", so no need any longer to filter it out of the classpath here Change-Id: Ifb01de5d9efa7ed264824030ad0e1333ab8b43ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88054 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-06Fix typoAndrea Gelmini
Change-Id: Ie8e7e01d2f89c9d2f7f1cbb081ba368c926260b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88071 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>