summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-04Just use Any ctor instead of makeAny in extensionsStephan Bergmann
Change-Id: I0441d30044168563b0d5b8406fcc99b51a9cbc1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133817 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in dbaccessStephan Bergmann
Change-Id: I8b20d60d536a8fb3d3396e1ce26bacf309637f40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133829 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Some JREs need the bin/server/jvm.dll path after allStephan Bergmann
...which had been removed in 18bdf78e156f3cd1e6ccbb3ae28e919583bac70c "Azul is just another OpenJDK variant", when fixing the previously mis-classified Azul JRE from "uses OtherInfo" to "uses SunInfo". But the IBM Semeru Runtime (<https://developer.ibm.com/languages/java/semeru-runtimes/downloads/>) is another arguably mis-classified case due to its java.vendor of "IBM Corporation" (and where the VENDOR_MAP_ENTRY<OtherInfo>("IBM Corporation"), line in jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx might be relevant for some other JRE from IBM; at least, that entry is present ever since the introduction of vendorlist.cxx in 738e9b77b9d181b376188e405e1eb353cf93c597 "INTEGRATION: CWS jl8"). So just generally support the bin/server/jvm.dll path here for "uses OtherInfo", even though it should actually only be necessary for "uses SunInfo". (See the mail thread starting at <https://listarchives.libreoffice.org/global/users/2022/msg00246.html> "[libreoffice-users] LibreOffice 7.3.3.2 Windows 64 bit seems not detect AdoptOpenJdk JRE Windows 64 bit runtime".) Change-Id: I3a4d02309b7c833c3cd32dc2dda4f4cb7b216693 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133827 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04upgrade to latest harfbuzzCaolán McNamara
Change-Id: I149d7a5d36c6546d3e6898b2b55ce6cd585d4d41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133824 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04Drop --with-iwyu optionGabor Kelemen
Nowadays the bin/find-unneeded-includes script is a better solution for this problem This essentially reverts the commits: c716b3888e7e8150d1c1053ee6550afb56438b1f 096c7e889f3b9bd42a81fb0216e2a68fb27159fc 40e7eecb7efeeb9af59206d7a9c82ac55adf5279 Change-Id: I404a4b34176efaacf961605559af9de6d6cba10a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133540 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-05-04Fix typo in cbc34f69ec6363cd234ad2b1dfe09bfb531238dbAurimas Fišeras
Signed-off-by: Aurimas Fišeras <aurimas@members.fsf.org> Change-Id: Iee5c7aec7817bc7af5f45d192165fe30301788d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133823 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-04Just use Any ctor instead of makeAny in editengStephan Bergmann
Change-Id: Ic6a392ce006c9348abc28a5940c4ee0425e5b990 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133820 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny (macOS)Stephan Bergmann
Change-Id: I6c185eecf943205f78567393f0ef588580ee4dab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133821 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04remove unused layout callLuboš Luňák
I should have removed this in bfb6a42e26de28d88ced43eb3a2c63ce323. Change-Id: Ieb4b5fabcc1eecf82dbacef66bef8288b6c51761 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133815 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2022-05-04libxml2: upgrade to release 2.9.14Michael Stahl
Fixes CVE-2022-29824. Change-Id: I31d6ec794b01dee0bb17022ef2e18d2acd8255df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133813 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-05-04Just use Any ctor instead of makeAny in embeddedobjStephan Bergmann
Change-Id: I7e00a4b17b9fc3ccfb360ae5737d253a7d31d02b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133819 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in embedservStephan Bergmann
Change-Id: I2e5f94454a9e5d157cec1f883546655e8c11bd1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133818 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Update git submodulesChristian Lohmaier
* Update translations from branch 'master' to 87be4f00f4c2a9b269779ee4f1d6b2417a45a113 - update translations for master and force-fix errors using pocheck Change-Id: I6f0fe9f8928d5a663a14c9d21990e37f94ee18f6
2022-05-04reduce string conversions in jsdialog::ExecuteActionNoel Grandin
Change-Id: Id1b908e06ebaa7f6ba5981abff51584623770215 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133814 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-05-04Just use Any ctor instead of makeAny in filterStephan Bergmann
Change-Id: I68bbbc2cc80ac5efde78e10706b488bf78c058bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133816 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04use more string_view in oox::vml::ConversionHelperNoel Grandin
Change-Id: I8616f608ee4cc62114acb4fbd774796bc11d1911 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133812 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-05-04android: Don't use log tag longer than 23 charsMichael Weghorn
Addresses this lint error: > .../android/source/src/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java:146: > Error: The logging tag can be at most 23 characters, was 31 > (GeckoSimpleScaleGestureDetector) [LongLogTag] > Log.e(LOGTAG, "No gesture taking place in getFocusX()!"); Change-Id: I1d18fb3717ccea8dc36695bfef888d035efe8d55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133799 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2022-05-04android: Make clear that column index is non-negativeMichael Weghorn
Use `Cursor#getColumnIndexOrThrow` instead of `Cursor#getColumnIndex` here, as suggested in the `Cursor#getColumnIndex` doc [1]: > Returns the zero-based index for the given column name, or -1 if the > column doesn't exist. If you expect the column to exist use > getColumnIndexOrThrow(java.lang.String) instead, which will make the > error more clear. As described in the `OpenableColumns` doc [2], `OpenableColumns.DISPLAY_NAME` is one of the two standard columns that must be supported: > These are standard columns for openable URIs. Providers that serve > openable URIs must support at least these columns when queried. Addresses this lint error: > .../android/source/src/java/org/libreoffice/ui/FileUtilities.java:139: Error: Value must be ≥ 0 [Range] > displayName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Explanation for issues of type "Range": > Some parameters are required to in a particular numerical range; this check > makes sure that arguments passed fall within the range. For arrays, Strings > and collections this refers to the size or length. [1] https://developer.android.com/reference/android/database/Cursor#getColumnIndex(java.lang.String) [2] https://developer.android.com/reference/android/provider/OpenableColumns Change-Id: I946fcd32a905a4bb8c0527fc1199b9dcc52bccfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133798 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2022-05-04android: Call base class implementation in 'onActivityResult'Michael Weghorn
Addresses this lint error: > android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java:253: Error: > Overriding method should call super.onActivityResult [MissingSuperCall] > protected void onActivityResult(int requestCode, int resultCode, Intent data) { > ~~~~~~~~~~~~~~~~ > > Explanation for issues of type "MissingSuperCall": > Some methods, such as View#onDetachedFromWindow, require that you also call > the super implementation as part of your method. Change-Id: Iab2bdadae7a776e4f52d671a6fd47c1b8146b2a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133797 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2022-05-04remove stray printfCaolán McNamara
not one of mine for a change Change-Id: Iaa4151f8fcb0b31d98514075473d2768fbadd69c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133810 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04ofz#47199 AbortCaolán McNamara
Change-Id: I5e18242b3a18f0c9ca1891ab4e29bd43aaab1f26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133811 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04Update git submodulesSeth Chaiklin
* Update helpcontent2 from branch 'master' to 21955867dc01dbc9e897c585c3a85299eb8f36ad - tdf#148444 corrections to Print Preview Bar and related pages text/swriter/main0210.xhp (Print Preview Bar) *change order of commands to match toolbar +add <embed> to (new) Single Page Preview +add "Jump to Specific Page" command (no icon exists) +add Print command and icon +add Close Preview command and icon +add <embeds> to "zoom in" and "zoom out" icons *refactor to <h1> text/swriter/02/10040000.xhp + add this file for Single Page Preview, with icon table text/swriter/02/10070000.xhp (Multiple Pages Preview) +commit beginning with 0f337351 in 2013 accidentally removed the <h1> line, now added back. *changed description to match current behavior of command +added More Options header *refactor to <h3> -remove colspan= rowspan= *change image to .svg *change image size to 1cm text/swriter/02/10080000.xhp (Book preview) *refactor to <h3> *change image to .svg *change image size to 1cm text/swriter/02/10020000.xhp (Zoom out) +add section to icon table *refactor to <h1> -remove colspan= rowspan= *change image size to 1cm *change image to .svg text/swriter/02/10010000.xhp (Zoom in) +add section to icon table *change image to .svg text/swriter/01/01120000.xhp (Print Preview) +add link to Print Preview Bar page in description -drop Related topics and link with incorrect label *refactor to <h1> Change-Id: I902fe42d7f0405e2cfe3600199f5ab3fcb7e459c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/132610 Tested-by: Jenkins Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
2022-05-04tdf#147919 PPTX export: fix curved and bent connector shapeTibor Nagy
by calculating and exporting adjustment values to avoid of connector lines with bad turns overlapping the connected shapes. Change-Id: I615a20f3ba3c5d03ae73d87848dc41e9ecd29ae5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133635 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2022-05-04tdf#146346 DOCX import: fix table margins in footnotesLászló Németh
Paragraph of the anchoring point of the floating table needs zero top and bottom margins, if the table was a not floating table in the footnote originally, otherwise docDefault (Standard) margins could result bigger vertical spaces around the table. Quasi regression from commit c46950fee11f5207fb8324947280cd565ae483e7 "tdf#143583 DOCX import: fix lost empty paragraphs of footnotes" (before this commit, empty paragraphs at the end of the footnotes were removed by accident, which hid the real problem fixed now). See also commit e11c51eefe8c3210cef2b5850f401ba67a401d01 "tdf#95806 tdf#125877 tdf#141172 DOCX: fix tables in footnotes" (Note: before this commit, only a single table was shown instead of the eight tables of the eight footnotes.) Change-Id: I4180a6f7d7c49faf0842637b23aa1c8c5680a76c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133752 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2022-05-04Just use Any ctor instead of makeAny in formsStephan Bergmann
Change-Id: I25183cc06728c81e45b28fd41071c15abf05bbc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133809 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in frameworkStephan Bergmann
Change-Id: I9f4990cf58cc794408dd70cd7fbfb2a8effa138c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133806 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in linguisticStephan Bergmann
Change-Id: I8697999ecedc1c3d368509470581635b087bcea8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133802 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04simplify lcl_parseHandleRefNoel Grandin
Change-Id: I0a7cb2754ab43b8b627f196c99778b5fa3f2e005 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133808 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-05-04tdf#131725 use first page directionality for x-reference dialog TreeViewCaolán McNamara
Change-Id: Ib827f4e73266f6416ba8459214263545291c4727 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133779 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in fpickerStephan Bergmann
Change-Id: Ib23b10759bdc7c2eca4b585992756075e2642dd4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133807 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Related: tdf#131725 match the basegfx translation to the mirror logicCaolán McNamara
that is used in the traditional code path, this will fix vcl RTL scrollbars in otherwise LTR UI Change-Id: I1451f7e17b93b0339ded6d33147df6415274ebfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133780 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in ioStephan Bergmann
Change-Id: I3b659072c54dde7f49aa90e5d52d24f5d762654a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133805 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Update git submodulesSeth Chaiklin
* Update helpcontent2 from branch 'master' to 987e2b26ee08db2d16ae224244324195c9247c17 - clarify use of Alt+Enter for sections and tables Change-Id: I5436fe3b75ba73bf866ce34268ab3b33dcdf1778 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/133600 Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk> Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> Tested-by: Jenkins
2022-05-04ucb: webdav-curl: fix handling of non-standard propertiesMichael Stahl
Sharepoint uses properties like these: "http://schemas.microsoft.com/repl/resourcetag" "urn:schemas-microsoft-com:Win32CreationTime" They aren't standard and don't match our own ucbprops namespace, and it looks like they should be handled by an encoding to a name like "<prop:Win32CreationTime xmlns:prop=\"urn:schemas-microsoft-com:\">" Unfortunately WebDAVResponseParser::endElement() didn't do that when handling a PROPFIND reply to get the property names. This causes a crash when all properties are copied in UniversalContentBroker::globalTransfer(), which is called by SfxMedium::DoBackup_Impl() when the setting "/org.openoffice.Office.Common/Save/Document/CreateBackup" is in effect. Change-Id: I2d6480bfd2f828b6e7fc431ba4b333d95ec12718 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133769 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-05-04Just use Any ctor instead of makeAny in javaunohelperStephan Bergmann
Change-Id: I71031155920e64eaf128d106cb0d18e9e744d34c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133803 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04use more string_view in unotoolsNoel Grandin
Change-Id: Id10d68f2eb016671be6842dfaa82909207b0708d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133754 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2022-05-04Just use Any ctor instead of makeAny in packageStephan Bergmann
Change-Id: I527024f34b88ec764488a3766872f1941f8dbb4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133794 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in starmathStephan Bergmann
Change-Id: I8264c2330837fbd46ea372a8e370bb43ca1fb7b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133775 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Related: tdf#131725 if SvTreeListBox RTL set, set scrollbars to matchCaolán McNamara
so if we have a RTL SvTreeListBox in a LTR environ then we get RTL scrollbars Change-Id: Ia9aaab81f273e31c61cfe4fd4e138709414ad599 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133778 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04remove completed TODOCaolán McNamara
Change-Id: I51c446c2e1e4b02df34200357b2d4ccafd69c7f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133777 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04sw content controls: enable indicator on the RHS of the content control endMiklos Vajna
To be consistent with the SwTextContentControl ctor, which calls SetDontExpand(false). This way typing expands the content control exactly when the indicator is visible. Change-Id: I44dc3e0a68643bc670b75da21110914e5c4f8f59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133801 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2022-05-04Just use Any ctor instead of makeAny in reportdesignStephan Bergmann
Change-Id: If8b6f8f7facf36f740b2e1773e923e28d8c85552 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133792 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in ooxStephan Bergmann
Change-Id: Id6c8341b545c819521056926ef1b80d20d148c5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133795 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04reset cached SalLayoutGlyphs when statusbar text changesLuboš Luňák
A mistake from bfb6a42e26de28d88ced43eb3a2c63ce323d33aa. Change-Id: Iddf885d41177e6dbbfdc1c916b45843f4d7ba499 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133796 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2022-05-04lay out entire strings in SalLayoutGlyphsCache more often (tdf#148911)Luboš Luňák
The document has parts of paragraphs e.g. underlined, which changes the vcl::Font part of the hash key. So if a paragraph starts that way but the rest is not underlined, the optimization of laying out the entire string would be missed. So do the optimization if there are subsequent calls for adjacent parts of the string (or starting at the same index and different length). Change-Id: I3d4a78b0eae42bd3085e96024340e6ed8daa9ad1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133790 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2022-05-04don't lay out entire strings for Writer layout testsLuboš Luňák
The SalLayoutGlyphsCache optimization of laying out an entire string if it looks like a caller will call it repeatedly for parts of the string conflicts with the SAL_ABORT_ON_NON_APPLICATION_FONT_USE checks causing PrintFontManager::Substitute() abort if font fallback happens. Simply disable the optimization, the output should be the same. Change-Id: I0cce6a0c2a1a2ce93b95df54d18fedbdc779f34f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133789 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2022-05-04Just use Any ctor instead of makeAny in pyunoStephan Bergmann
Change-Id: I53eb836c64e8e4a354c5c895bc7f16b168bd4cf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133793 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in sccompStephan Bergmann
Change-Id: I4872a74604b97ba68a7db10c2980fc32605bc492 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133787 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04Just use Any ctor instead of makeAny in saxStephan Bergmann
Change-Id: I3aec9eecc35eeabd2be61c73a57cff220843c9b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133791 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-04CppunitTest_sw_ooxmlexport11: avoid mustTestImportOf()Miklos Vajna
Can use CPPUNIT_TEST_FIXTURE() instead. See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd (CppunitTest_sw_rtfimport: convert one testcase to use CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation. Change-Id: I104989efd62758f5da862b95a4d9bbcac536b46f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133773 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>