summaryrefslogtreecommitdiff
path: root/sd/inc
AgeCommit message (Collapse)AuthorFilesLines
2020-11-10tdf#126700 handle Impress default documentsJan-Marek Glogowski1-1/+3
Impress has a two stage load, eventually because of the optional template manager. Since I don't know, what the 2nd load URL "private:object" is used for otherwise in LO, this just marks the empty and default documents as replaceable in Impress. Regressed-by: 61e1e0413296928d929f99c0f006c6cbbcf4ac40 Change-Id: Ief8d9eeaa65e8fb40400e64c16768d37ca343893 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104581 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit d4892e5452bff155da6c34063ffe8c331284d8e9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105065
2020-10-27tdf#127680 Add the option to print even or odd values from a particular rangeSrijan Bhatia1-4/+0
Added a box besides the pages option that lets the user choose between left and right pages/left pages/right pages. Change-Id: Iee0386f4f3cfd2dac3fcf898a3fefb5434cb27a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96612 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104877 Reviewed-by: Sophie Gautier <sophi@libreoffice.org>
2020-06-13tdf#132137 Rename Default Style to Default Drawing Style in Draw and Impress.Srijan Bhatia1-1/+1
Change-Id: I130bd0e070a3449753cc76a8f7e6352c8b7a1bba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95403 Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit 4949050c43300eee047531d856bd4a25e60980c3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96217 Tested-by: Jenkins
2020-05-24remove some unused definesNoel Grandin1-17/+0
Change-Id: Ibfdc84f07642db6ec8362c4d76195b4f39dc103c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94731 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-23sd: move SearchSelection constructor to header fileTomaž Vajngerl1-1/+6
Change-Id: I71d7986044208b6c733c1d46db7bf84bc6254915 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94727 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-05-11remove archaic Content.xml fallbackCaolán McNamara1-1/+0
there's no evidence that Content.xml (or Meta.xml) was written by any released version to necessitate the fallback reportdesign Settings.xml and Style.xml fallbacks appear to be cargocult influenced by the Content.xml/Meta.xml examples Change-Id: I51d138344edaffc6d21e17c2d28047ea6316304e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93970 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-05-09compact namespace in sdNoel Grandin9-17/+17
Change-Id: Ifa8b9cb2a6c06e0365245790cfd1c4775bd87d15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93861 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-26update pchesCaolán McNamara2-6/+7
Change-Id: I83a61da7dda6c72552eecd377f1c3744c92a797e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92909 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22uiobject.hxx only needs forward declaresCaolán McNamara2-6/+2
and update pches accordingly Change-Id: I411712532fd85961bffe6678416fcdc1d9c7f53d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92617 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-06remove newly unused stuffCaolán McNamara2-5/+4
Change-Id: Idce9955294372817c0dd1f40ebd38f16fc90eab5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91007 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-06weld custom animation panelCaolán McNamara1-1/+0
and align animation panel and slide transitions panel padding/spacing Change-Id: I25a1d10894de635ebb9c8a1cba358940886125c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91006 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-03convert PresObjKind to scoped enumNoel Grandin1-21/+20
Change-Id: I30761f15f46f91435e80296c4f685bc691bb6304 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91600 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-01convert DocCreationMode to scoped enumNoel Grandin1-3/+3
Change-Id: I42fd704601fe81462f17b3968911fd79c13b50ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91473 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-01convert SnapKind to scoped enumNoel Grandin1-1/+2
Change-Id: I56a17f582b66212933077a7de62b3dbe7d3c3af5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91465 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-01convert SdOptionStreamMode to scoped enumNoel Grandin1-3/+3
Change-Id: Ib9784c5364e52dde03c0ba2a91cc8fab9d286029 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91464 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-01convert SdXMLFilterMode to scoped enumNoel Grandin1-4/+4
Change-Id: I5e5e533c076f3108fed776d00c7ec649e202d9df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91463 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-01convert PresentationObjects to scoped enumNoel Grandin1-15/+15
Change-Id: I65c030d33b0c3ed6350e98e9a8a63414c905f88c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91462 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-01convert PresChange to scoped enumNoel Grandin1-7/+5
Change-Id: I8184e436ae9c0fd2cb78a94b3146ab1903453f72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91459 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-03-12Revert "loplugin:constfields in sd"Noel Grandin12-15/+15
This reverts commit 453879cfd8f4a8e22847043231a0929e4d50f238. Change-Id: Ic542fd6b1f09d71d8e6c9530198fe45151d75e16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90410 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-03-07clang-format sd with under 5-percent lines of changeMuhammet Kara2-24/+28
Files which could become clang-format conformant with under 5-percent lines of change relative to the total count of lines in the file are found by using bin/find-clang-format.py, and fixed with /opt/lo/bin/clang-format -i <path-of-the-file> There will be follow-up patches to fix all 'under-5-percent' files. Change-Id: I08c01d7069b041964614c233d452d70f332228f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90145 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-03-01lok: Set default text for new text box on mobileMuhammet Kara1-0/+1
Change-Id: I0b6056e9dbf5fb81d092092cc183b05120b95d70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89352 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89710 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-02-28android: Hardcode the 'double-tap' in case of the native app.Jan Holesovsky1-0/+4
We know we are mobile, so why bother... We could go even further, and do that directly in the comphelper, but that would need more testing I guess. Change-Id: Ia371d42fe0e31b5c6f17313fbf6baad4c256cbe9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89236 Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89695 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-02-26weld impress navigatorCaolán McNamara4-30/+6
complicated by the effort to keep the non-standard behaviour of commit f3c68cdf8f6a0273c62b493552f78af0138a44e8 Date: Wed Feb 21 17:27:53 2018 +0100 tdf#115873 sd navigator: allow selecting but not focusing on objects and the self-dnd code Change-Id: I29c224739463d1d44690f30ed29db3fe2b16b4a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89045 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-21Drop o3tl::optional wrapperStephan Bergmann2-2/+2
...now that macOS builds are guaranteed to have std::optional since 358146bbbd1b9775c12770fb5e497b6ec5adfc51 "Bump macOS build baseline to Xcode 11.3 and macOS 10.14.4". The change is done mostly mechanically with > for i in $(git grep -Fl optional); do > sed -i -e 's:<o3tl/optional\.hxx>\|\"o3tl/optional\.hxx\":<optional>:' \ > -e 's/\<o3tl::optional\>/std::optional/g' \ > -e 's/\<o3tl::make_optional\>/std::make_optional/g' "$i" > done > for i in $(git grep -Flw o3tl::nullopt); do > sed -i -e 's/\<o3tl::nullopt\>/std::nullopt/g' "$i" > done (though that causes some of the resulting #include <optional> to appear at different places relative to other includes than if they had been added manually), plus a few manual modifications: * adapt bin/find-unneeded-includes * adapt desktop/IwyuFilter_desktop.yaml * remove include/o3tl/optional.hxx * quote resulting "<"/">" as "&lt;"/"&gt;" in officecfg/registry/cppheader.xsl * and then solenv/clang-format/reformat-formatted-files Change-Id: I68833d9f7945e57aa2bc703349cbc5a56b342273 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89165 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-17Resolves tdf#129032 - Missing warning when renaming pageHeiko Tietze1-0/+1
Edit field has type normal or error now Edit field and okay button return feedback per tooltip Change-Id: Ib2caf3280227cb00af25889ed111503745b471dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85101 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-02-14use forward decls to reduce including unnecessary headersCaolán McNamara1-4/+1
Change-Id: Iaa25ac1ac99e0dcf09bce21f4bad8cb9b5568a1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88633 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-02-06weld SvxMetricFieldCaolán McNamara2-2/+6
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-06drop unnecessary includeCaolán McNamara1-5/+1
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-01make update_pch also consider files in <module>/src/**/incLuboš Luňák2-2/+255
With --enable-pch=full there's not much difference between a "public" header in <module>/inc and a private one in <module>/src/somewhere/inc . And since the script searches recursively, this apparently helps to find even more headers for lower pch levels. Change-Id: I8483d0aa5b4fea5a59107c20a8aa5f1ef694af0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87799 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-01android lok: Correct the hint in the slides from click to double-tap.Jan Holesovsky1-0/+4
Change-Id: I71744dc48f50115c9b4245ac2c81a6431ecbdce6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87678 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins
2020-01-28update sd pchesCaolán McNamara2-6/+8
Change-Id: If8de411ce76a3ffa15384fac3ce7900b5aefebbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87641 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-01-28weld AnimationWindowCaolán McNamara1-0/+2
Change-Id: I66bcd02a5fc98fff4d2fb0fcd24d702ff894d536 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87638 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-27weld DisplayModeToolbarMenuCaolán McNamara1-2/+0
Change-Id: I210c608d2493c5b8b1ccf32af39c51b144bb45e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87509 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-26tdf#124176: Use pragma once instead of include guardsMehmet Emin Başoğlu1-4/+1
Change-Id: Iaf87f70db32bcdb9ae079732e931b4c80879e247 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87383 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-01-22tdf#129786 give correct title for Draw dialog boxSeth Chaiklin1-1/+1
Change-Id: Ied53edf066ce8a554899848f261a272f812121cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87180 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-01-06weld AreaPropertyPanelCaolán McNamara2-3/+3
Change-Id: I5f4c4b43067b99cd57f8ea941002481ef5977e09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86144 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-01-04tdf#129708 speed-up: reuse enumeration for each effectSerge Krot1-1/+3
Change-Id: I336278c5a9eec75a2a71fe4d04d2029a5a08e6a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86102 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-12-20loplugin:duplicate-definesNoel Grandin1-2/+2
Change-Id: Ic98501b755fee242bf40d4e60b2116fe500522e6 Reviewed-on: https://gerrit.libreoffice.org/85568 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-12-11Related: tdf#129267 format numbers with the UI localeCaolán McNamara1-16/+22
Change-Id: I70d8cc48869073596c101eec6a6d3a79db044a78 Reviewed-on: https://gerrit.libreoffice.org/84883 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-12-10use double prime for inch symbolCaolán McNamara1-3/+3
Change-Id: I6a663bcb55155bd2331aa79cebd5b922c2ee7605 Reviewed-on: https://gerrit.libreoffice.org/84787 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-12-09separate cm from value in built-in en_US stringsCaolán McNamara1-3/+3
Change-Id: I64f78192d176fe225baea789e2283c5c95ab62fa Reviewed-on: https://gerrit.libreoffice.org/84786 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-12-05CppunitTest_sd_dialogs_test still needs some symbols as SD_DLLPUBLICStephan Bergmann1-1/+1
...after e189a3f5b5c4f381dcf109eb9a2ee9b6d32d5551 "make some classes module private": > [LNK] CppunitTest/libtest_sd_dialogs_test.so > sd/qa/unit/dialogs-test.cxx:107: error: undefined reference to 'SdAbstractDialogFactory::Create()' > sd/qa/unit/dialogs-test.cxx:160: error: undefined reference to 'typeinfo for sd::DrawView' Change-Id: Ib173d576bfe3c59c31229bb769999693d8ec9d57 Reviewed-on: https://gerrit.libreoffice.org/84575 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-05make some classes module privateNoel Grandin1-1/+1
Mark some stuff SAL_DLLPUBLIC_RTTI in include/vcl/metaact.hxx in order to make ASAN happy. Change-Id: I97febe0968bf58b9cbe60ce647f0ada25e6f4bb0 Reviewed-on: https://gerrit.libreoffice.org/84202 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-12-04remove some unnecessary includes and update pchesCaolán McNamara1-3/+5
Change-Id: Ieee11f2ea3c5c18a84316a8b7c39a261afd720ed Reviewed-on: https://gerrit.libreoffice.org/84308 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-12-02use weld::WaitObjectCaolán McNamara1-5/+4
Change-Id: Ib2ad0f0fe17c4db66693ef91e3cdbc8511eb8314 Reviewed-on: https://gerrit.libreoffice.org/84166 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-12-01Introduce o3tl::optional as an alias for std::optionalStephan Bergmann2-3/+3
...with a boost::optional fallback for Xcode < 10 (as std::optional is only available starting with Xcode 10 according to <https://en.cppreference.com/w/cpp/compiler_support>, and our baseline for iOS and macOS is still Xcode 9.3 according to README.md). And mechanically rewrite all code to use o3tl::optional instead of boost::optional. One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per fed7c3deb3f4ec81f78967c2d7f3c4554398cb9d "Slience bogus -Werror=maybe-uninitialized" should no longer be necessary (and whose check happened to no longer trigger for GCC 10 trunk, even though that compiler would still emit bogus -Wmaybe-uninitialized for uses of boost::optional under --enable-optimized, which made me ponder whether this switch from boost::optional to std::optional would be a useful thing to do; I keep that configure.ac check for now, though, and will only remove it in a follow up commit). Another longer-term benefit is that the code is now already in good shape for an eventual switch to std::optional (a switch we would have done anyway once we no longer need to support Xcode < 10). Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses boost::property_tree::ptree::get_child_optional returning boost::optional, so let it keep using boost::optional for now. After a number of preceding commits have paved the way for this change, this commit is completely mechanical, done with > git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\<boost(/optional)?/optional\.hpp\>|o3tl/optional.hxx|g' -e 's/\<boost(\s*)::(\s*)(make_)?optional\>/o3tl\1::\2\3optional/g' -e 's/\<boost(\s*)::(\s*)none\>/o3tl\1::\2nullopt/g' (before committing include/o3tl/optional.hxx, and relying on some GNU features). It excludes some files where mention of boost::optional et al should apparently not be changed (and the sub-repo directory stubs). It turned out that all uses of boost::none across the code base were in combination with boost::optional, so had all to be rewritten as o3tl::nullopt. Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b Reviewed-on: https://gerrit.libreoffice.org/84128 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-30tdf#94947 Set preset-id for user defined motion paths.Mark Hung1-2/+2
User defined motion paths ( curve, polygon, freeform line ) did not have preset-id. Set the preset-id so that the preset type will be highlighted in the custom animation pane after editing. "libo-motionpath-curve", "libo-motionpath-polygon", and "libo-motionpath-freeform-line" are used for the three user defined motion paths. This patch is related to tdf#94947, though it doesn't make the original document display correctly by guessing the missing preset-id, but it prevent empty preset-id to be generated when creating those three motion path animation. Change-Id: I50c0133bea32e022b07e5d8c0a024810844f124d Reviewed-on: https://gerrit.libreoffice.org/83079 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
2019-11-30sd: fix typo maEffectDiscriptorMap -> maEffectDescriptorMap;Mark Hung1-1/+1
Change-Id: Ie0e8dc67969ca680e80c544f954d3bef9adbcb33 Reviewed-on: https://gerrit.libreoffice.org/83078 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
2019-11-22make some classes module-privateNoel Grandin2-3/+3
Change-Id: If7303a082e06f6937fca911c578a40475546cda2 Reviewed-on: https://gerrit.libreoffice.org/83442 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-11-07android: ODR fix of RID_PAGEFORMATPANEL_MARGINS_CM.Jan Holesovsky1-0/+5
Without this, we get a linking error that RID_PAGEFORMATPANEL_MARGINS_CM is defined twice. Change-Id: Ib9c07adcb0a8def991d1e39429c1bb4947cd7d32 Reviewed-on: https://gerrit.libreoffice.org/82159 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>