compilerplugins/clang/unusedvarsglobal.py | 6 compilerplugins/clang/unusedvarsglobal.untouched.results | 92 ++++- compilerplugins/clang/unusedvarsglobal.writeonly.results | 246 ++++++++++----- include/editeng/unoprnms.hxx | 2 include/svl/inettype.hxx | 1 sc/source/core/inc/sharedstringpoolpurge.hxx | 1 6 files changed, 246 insertions(+), 102 deletions(-)
New commits: commit 230e46106578a2abf8211b51c071c037fc6e5ad2 Author: Noel Grandin <[email protected]> AuthorDate: Fri Jun 10 14:17:25 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Jun 10 21:13:43 2022 +0200 loplugin:unusedvarsglobal Change-Id: I37a1772ffdd682d17571aa06e24089136d2d8547 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135600 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/compilerplugins/clang/unusedvarsglobal.py b/compilerplugins/clang/unusedvarsglobal.py index da268794bb6e..039c1f86a451 100755 --- a/compilerplugins/clang/unusedvarsglobal.py +++ b/compilerplugins/clang/unusedvarsglobal.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 import sys import re @@ -12,7 +12,7 @@ defToTypeMap = dict() def parseFieldInfo( tokens ): return (tokens[1].strip(), tokens[2].strip()) -with io.open("workdir/loplugin.unusedvarsglobal.log", "rb", buffering=1024*1024) as txt: +with io.open("workdir/loplugin.unusedvarsglobal.log", "r", buffering=16*1024*1024) as txt: for line in txt: try: tokens = line.strip().split("\t") @@ -46,7 +46,7 @@ with io.open("workdir/loplugin.unusedvarsglobal.log", "rb", buffering=1024*1024) else: print( "unknown line: " + line) except IndexError: - print "problem with line " + line.strip() + print("problem with line " + line.strip()) raise definitionSet2 = set() diff --git a/compilerplugins/clang/unusedvarsglobal.untouched.results b/compilerplugins/clang/unusedvarsglobal.untouched.results index 4a40feec0bf2..9a9216a208a3 100644 --- a/compilerplugins/clang/unusedvarsglobal.untouched.results +++ b/compilerplugins/clang/unusedvarsglobal.untouched.results @@ -1,44 +1,96 @@ -canvas/workben/canvasdemo.cxx:669 +canvas/workben/canvasdemo.cxx:666 (anonymous namespace)::DemoApp aApp -cppu/source/uno/check.cxx:315 +connectivity/source/drivers/evoab2/EApi.h:51 + gconstpointer (*)(EContact *, EContactField) e_contact_get_const +connectivity/source/drivers/evoab2/EApi.h:55 + char *(*)(ESource *) e_source_peek_name +connectivity/source/drivers/evoab2/EApi.h:64 + GSList *(*)(ESourceList *) e_source_list_peek_groups +connectivity/source/drivers/evoab2/EApi.h:70 + GSList *(*)(ESourceGroup *) e_source_group_peek_sources +connectivity/source/drivers/evoab2/EApi.h:71 + char *(*)(ESourceGroup *) e_source_group_peek_base_uri +connectivity/source/drivers/evoab2/EApi.h:90 + char *(*)(EBook *) e_book_get_uri +connectivity/source/drivers/evoab2/EApi.h:93 + gboolean (*)(ESourceList **, GError **) e_book_get_addressbooks +connectivity/source/drivers/evoab2/EApi.h:101 + gboolean (*)(EBook *, const char *, const char *, const char *, GError **) e_book_authenticate_user +cppu/source/uno/check.cxx:329 (anonymous namespace)::BinaryCompatible_Impl aTest -framework/source/services/ContextChangeEventMultiplexer.cxx:370 +desktop/source/lib/init.cxx:6493 + SvtOptionsDialogOptions aDialogOptions +desktop/source/lib/init.cxx:6494 + SvtCTLOptions aSvtCTLOptions +desktop/source/lib/init.cxx:6495 + SvtAccessibilityOptions aSvtAccessibilityOptions +desktop/source/lib/init.cxx:6496 + svtools::ColorConfig aColorConfig +desktop/source/lib/init.cxx:6497 + SvtMiscOptions aSvtMiscOptions +desktop/source/lib/init.cxx:6498 + SvtSlideSorterBarOptions aSvtSlideSorterBarOptions +desktop/source/lib/init.cxx:6499 + SvtCommandOptions aSvtCommandOptions +desktop/source/lib/init.cxx:6500 + SvtCompatibilityOptions aSvtCompatibilityOptions +desktop/source/lib/init.cxx:6501 + SvtFilterOptions aSvtFilterOptions +desktop/source/lib/init.cxx:6502 + SvtLinguConfig aSvtLinguConfig +desktop/source/lib/init.cxx:6503 + SvtModuleOptions aSvtModuleOptions +desktop/source/lib/init.cxx:6504 + SvtPathOptions aSvtPathOptions +desktop/source/lib/init.cxx:6505 + SvtSearchOptions aSvtSearchOptions +desktop/source/lib/init.cxx:6506 + SvtSysLocaleOptions aSvtSysLocaleOptions +desktop/source/lib/init.cxx:6507 + SvtUserOptions aSvtUserOptions +desktop/source/lib/init.cxx:6509 + MouseSettings aMouseSettings +desktop/source/lib/init.cxx:6510 + StyleSettings aStyleSettings +desktop/source/lib/init.cxx:6511 + MiscSettings aMiscSettings +desktop/source/lib/init.cxx:6512 + HelpSettings aHelpSettings +desktop/source/lib/init.cxx:6513 + AllSettings aAllSettings +framework/source/services/ContextChangeEventMultiplexer.cxx:352 framework::(anonymous namespace)::Hook g_hook -hwpfilter/source/nodes.h:92 +hwpfilter/source/nodes.h:89 int count pyuno/source/module/pyuno_gc.cxx:45 pyuno::(anonymous namespace)::StaticDestructorGuard guard sal/osl/all/utility.cxx:45 osl::(anonymous namespace)::OGlobalTimer aGlobalTimer -sal/qa/osl/file/osl_File.cxx:4970 +sal/qa/osl/file/osl_File.cxx:4978 (anonymous namespace)::GlobalObject theGlobalObject sal/rtl/cmdargs.cxx:46 (anonymous namespace)::ArgHolder argHolder -sal/rtl/strtmpl.hxx:1258 +sal/rtl/strtmpl.hxx:890 IMPL_RTL_STRINGDATA data -sc/source/ui/inc/inscodlg.hxx:88 - _Bool bPreviousAllCheck -sdext/source/presenter/PresenterHelper.hxx:33 - rtl::OUString msCenterPaneURL +sc/source/core/inc/sharedstringpoolpurge.hxx:43 + sc::SharedStringPoolPurge * self +sfx2/source/bastyp/fltfnc.cxx:80 + SfxFilterListener theSfxFilterListener soltools/cpp/cpp.h:239 int Lflag soltools/mkdepend/parse.c:40 symhash * maininclist soltools/mkdepend/pr.c:34 int width -starmath/inc/ElementsDockingWindow.hxx:81 - std::tuple<const char *, const SmElementDescr *, size_t> [0] m_a6Categories svx/source/gengal/gengal.cxx:323 (anonymous namespace)::GalApp aGalApp -vcl/backendtest/VisualBackendTest.cxx:799 +svx/source/items/svxerr.cxx:32 + SvxErrorHandler SINGLETON +vcl/backendtest/VisualBackendTest.cxx:883 (anonymous namespace)::VisualBackendTestApp aApplication -vcl/source/uipreviewer/previewer.cxx:113 - (anonymous namespace)::UIPreviewApp aApp -vcl/workben/icontest.cxx:214 +vcl/workben/icontest.cxx:212 (anonymous namespace)::IconTestApp aApp -vcl/workben/mtfdemo.cxx:162 +vcl/workben/mtfdemo.cxx:243 (anonymous namespace)::DemoMtfApp aApp -vcl/workben/vcldemo.cxx:2258 +vcl/workben/vcldemo.cxx:2268 (anonymous namespace)::DemoApp aApp -xmloff/source/forms/elementimport.hxx:54 - xmloff::OElementNameMap::MapString2Element s_sElementTranslations diff --git a/compilerplugins/clang/unusedvarsglobal.writeonly.results b/compilerplugins/clang/unusedvarsglobal.writeonly.results index a79fcd405751..c0a6635859dc 100644 --- a/compilerplugins/clang/unusedvarsglobal.writeonly.results +++ b/compilerplugins/clang/unusedvarsglobal.writeonly.results @@ -1,51 +1,127 @@ -basctl/source/basicide/localizationmgr.cxx:56 +basctl/source/basicide/localizationmgr.cxx:57 rtl::OUStringLiteral<2> aSemi chart2/source/view/inc/ViewDefines.hxx:29 double ZDIRECTION -connectivity/source/drivers/hsqldb/HDriver.cxx:345 +connectivity/source/drivers/hsqldb/HDriver.cxx:346 Reference<class com::sun::star::frame::XTerminateListener> s_xTerminateListener -connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx:38 +connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx:39 std::string wild -cppuhelper/source/servicemanager.cxx:2024 +connectivity/source/inc/dbase/DIndex.hxx:26 + rtl::OStringLiteral<10> dBASE_III_GROUP +cppuhelper/source/servicemanager.cxx:2009 std::vector<css::uno::Mapping> maMaps -dbaccess/source/ui/browser/genericcontroller.cxx:462 - sal_Int32 s_nRecursions -hwpfilter/source/grammar.cxx:399 +hwpfilter/source/grammar.cxx:307 int yynerrs -hwpfilter/source/hbox.h:66 +hwpfilter/source/hbox.h:67 int boxCount hwpfilter/source/ksc5601.h:184 - hchar [4888] ksc5601_2uni_page4a -hwpfilter/source/nodes.h:98 + hchar[4888] ksc5601_2uni_page4a +hwpfilter/source/nodes.h:95 std::vector<std::unique_ptr<Node> > nodelist -i18npool/inc/calendar_hijri.hxx:46 - double SynMonth -i18npool/inc/calendar_hijri.hxx:56 - double SA_TimeZone -i18npool/inc/calendar_hijri.hxx:59 - double EveningPeriod -i18npool/inc/calendar_hijri.hxx:62 - sal_Int32 [] LeapYear -idlc/source/idlccompile.cxx:51 +idlc/source/idlccompile.cxx:47 int yydebug -include/vcl/animate/Animation.hxx:96 +include/comphelper/storagehelper.hxx:29 + rtl::OUStringLiteral<14> PACKAGE_STORAGE_FORMAT_STRING +include/editeng/unoprnms.hxx:24 + rtl::OUStringLiteral<15> UNO_NAME_CHAR_COLOR_THEME +include/editeng/unoprnms.hxx:25 + rtl::OUStringLiteral<21> UNO_NAME_CHAR_COLOR_TINT_OR_SHADE +include/editeng/unoprnms.hxx:29 + rtl::OUStringLiteral<14> UNO_NAME_CHAR_UNDERLINE +include/svl/inettype.hxx:106 + rtl::OUStringLiteral<11> CONTENT_TYPE_STR_IMAGE_WEBP +include/svtools/soerr.hxx:36 + ErrMsgCode[] RID_SO_ERROR_HANDLER +include/tools/color.hxx:471 + Color COL_AUTHOR1_DARK +include/tools/color.hxx:472 + Color COL_AUTHOR1_NORMAL +include/tools/color.hxx:473 + Color COL_AUTHOR1_LIGHT +include/tools/color.hxx:474 + Color COL_AUTHOR2_DARK +include/tools/color.hxx:475 + Color COL_AUTHOR2_NORMAL +include/tools/color.hxx:476 + Color COL_AUTHOR2_LIGHT +include/tools/color.hxx:477 + Color COL_AUTHOR3_DARK +include/tools/color.hxx:478 + Color COL_AUTHOR3_NORMAL +include/tools/color.hxx:479 + Color COL_AUTHOR3_LIGHT +include/tools/color.hxx:480 + Color COL_AUTHOR4_DARK +include/tools/color.hxx:481 + Color COL_AUTHOR4_NORMAL +include/tools/color.hxx:482 + Color COL_AUTHOR4_LIGHT +include/tools/color.hxx:483 + Color COL_AUTHOR5_DARK +include/tools/color.hxx:484 + Color COL_AUTHOR5_NORMAL +include/tools/color.hxx:485 + Color COL_AUTHOR5_LIGHT +include/tools/color.hxx:486 + Color COL_AUTHOR6_DARK +include/tools/color.hxx:487 + Color COL_AUTHOR6_NORMAL +include/tools/color.hxx:488 + Color COL_AUTHOR6_LIGHT +include/tools/color.hxx:489 + Color COL_AUTHOR7_DARK +include/tools/color.hxx:490 + Color COL_AUTHOR7_NORMAL +include/tools/color.hxx:491 + Color COL_AUTHOR7_LIGHT +include/tools/color.hxx:492 + Color COL_AUTHOR8_DARK +include/tools/color.hxx:493 + Color COL_AUTHOR8_NORMAL +include/tools/color.hxx:494 + Color COL_AUTHOR8_LIGHT +include/tools/color.hxx:495 + Color COL_AUTHOR9_DARK +include/tools/color.hxx:496 + Color COL_AUTHOR9_NORMAL +include/tools/color.hxx:497 + Color COL_AUTHOR9_LIGHT +include/tools/color.hxx:498 + Color COL_AUTHOR_TABLE_INS +include/tools/color.hxx:499 + Color COL_AUTHOR_TABLE_DEL +include/tools/urlobj.hxx:40 + rtl::OUStringLiteral<7> INET_FTP_SCHEME +include/tools/urlobj.hxx:41 + rtl::OUStringLiteral<8> INET_HTTP_SCHEME +include/tools/urlobj.hxx:42 + rtl::OUStringLiteral<9> INET_HTTPS_SCHEME +include/tools/urlobj.hxx:43 + rtl::OUStringLiteral<8> INET_FILE_SCHEME +include/tools/urlobj.hxx:44 + rtl::OUStringLiteral<8> INET_MAILTO_SCHEME +include/vcl/animate/Animation.hxx:97 sal_uLong mnAnimCount -include/xmloff/xmlimp.hxx:531 - rtl::OUStringLiteral<1> aDefaultNamespace +include/vcl/salnativewidgets.hxx:351 + int m_nOverlap +include/xmloff/odffields.hxx:45 + rtl::OUStringLiteral<11> ODF_FORMDATE_CURRENTDATE_FORMAT libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:31 gpointer gtv_comments_sidebar_parent_class -libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:61 +libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:62 gpointer gtv_lok_dialog_parent_class sal/osl/unx/system.cxx:164 void *[3] dummy sal/qa/osl/condition/osl_Condition_Const.h:41 rtl::OUString aTestCon sal/qa/osl/condition/osl_Condition_Const.h:43 - char [17] pTestString + char[17] pTestString sal/qa/osl/file/osl_File_Const.h:63 - char [11] pBuffer_Number + char[11] pBuffer_Number sal/qa/osl/file/osl_File_Const.h:64 - char [1] pBuffer_Blank + char[1] pBuffer_Blank +sal/qa/osl/file/osl_File_Const.h:119 + rtl::OUString aRootURL sal/qa/osl/file/osl_File_Const.h:129 rtl::OUString aCanURL2 sal/qa/osl/file/osl_File_Const.h:131 @@ -85,96 +161,116 @@ sal/qa/osl/file/osl_File_Const.h:189 sal/qa/osl/file/osl_File_Const.h:190 rtl::OUString aVolURL6 sal/qa/osl/security/osl_Security_Const.h:48 - char [17] pTestString + char[17] pTestString sal/qa/OStringBuffer/rtl_String_Const.h:275 - sal_Unicode [3] uTestStr31 + sal_Unicode[3] uTestStr31 sal/qa/OStringBuffer/rtl_String_Const.h:276 - sal_Unicode [4] uTestStr32 + sal_Unicode[4] uTestStr32 sal/qa/OStringBuffer/rtl_String_Const.h:297 - sal_Int32 [5] kInt32MaxNums + sal_Int32[5] kInt32MaxNums sal/qa/OStringBuffer/rtl_String_Const.h:306 - sal_Int64 [7] kInt64MaxNums + sal_Int64[7] kInt64MaxNums sal/qa/OStringBuffer/rtl_String_Const.h:335 - double [24] expValDouble + double[24] expValDouble sal/qa/OStringBuffer/rtl_String_Const.h:345 - float [22] expValFloat + float[22] expValFloat sal/qa/OStringBuffer/rtl_String_Const.h:355 - sal_Unicode [15] expValChar + sal_Unicode[15] expValChar sal/qa/OStringBuffer/rtl_String_Const.h:364 - sal_Unicode [6] input1Default + sal_Unicode[6] input1Default sal/qa/OStringBuffer/rtl_String_Const.h:368 - sal_Int32 [6] input2Default + sal_Int32[6] input2Default sal/qa/OStringBuffer/rtl_String_Const.h:372 - sal_Int32 [6] expValDefault + sal_Int32[6] expValDefault sal/qa/OStringBuffer/rtl_String_Const.h:378 - sal_Unicode [10] input1Normal + sal_Unicode[10] input1Normal sal/qa/OStringBuffer/rtl_String_Const.h:382 - sal_Int32 [10] input2Normal + sal_Int32[10] input2Normal sal/qa/OStringBuffer/rtl_String_Const.h:386 - sal_Int32 [10] expValNormal + sal_Int32[10] expValNormal sal/qa/OStringBuffer/rtl_String_Const.h:392 - sal_Unicode [5] input1lastDefault + sal_Unicode[5] input1lastDefault sal/qa/OStringBuffer/rtl_String_Const.h:396 - sal_Int32 [5] input2lastDefault + sal_Int32[5] input2lastDefault sal/qa/OStringBuffer/rtl_String_Const.h:400 - sal_Int32 [5] expVallastDefault + sal_Int32[5] expVallastDefault sal/qa/OStringBuffer/rtl_String_Const.h:406 - sal_Unicode [8] input1lastNormal + sal_Unicode[8] input1lastNormal sal/qa/OStringBuffer/rtl_String_Const.h:410 - sal_Int32 [8] input2lastNormal + sal_Int32[8] input2lastNormal sal/qa/OStringBuffer/rtl_String_Const.h:414 - sal_Int32 [8] expVallastNormal + sal_Int32[8] expVallastNormal sal/qa/OStringBuffer/rtl_String_Const.h:420 - sal_Int32 [6] input2StrDefault + sal_Int32[6] input2StrDefault sal/qa/OStringBuffer/rtl_String_Const.h:424 - sal_Int32 [6] expValStrDefault + sal_Int32[6] expValStrDefault sal/qa/OStringBuffer/rtl_String_Const.h:430 - sal_Int32 [9] input2StrNormal + sal_Int32[9] input2StrNormal sal/qa/OStringBuffer/rtl_String_Const.h:434 - sal_Int32 [9] expValStrNormal + sal_Int32[9] expValStrNormal sal/qa/OStringBuffer/rtl_String_Const.h:440 - sal_Int32 [6] input2StrLastDefault + sal_Int32[6] input2StrLastDefault sal/qa/OStringBuffer/rtl_String_Const.h:444 - sal_Int32 [6] expValStrLastDefault + sal_Int32[6] expValStrLastDefault sal/qa/OStringBuffer/rtl_String_Const.h:450 - sal_Int32 [12] input2StrLastNormal + sal_Int32[12] input2StrLastNormal sal/qa/OStringBuffer/rtl_String_Const.h:454 - sal_Int32 [12] expValStrLastNormal -sal/qa/rtl/strings/test_oustring_stringliterals.cxx:47 - rtlunittest::OUStringLiteral<6> dummy + sal_Int32[12] expValStrLastNormal +sc/inc/mtvelements.hxx:116 + mdds::mtv::lu_factor_t loop_unrolling sc/source/core/data/drwlayer.cxx:86 E3dObjFactory * pF3d -sd/source/ui/inc/framework/FrameworkHelper.hxx:80 - rtl::OUStringLiteral<28> msTaskPanelURLPrefix -sfx2/source/appl/appdata.cxx:48 +sfx2/inc/strings.hxx:48 + rtl::OUStringLiteral<7> STR_TEMPLATE_NAME31_DEF +sfx2/inc/strings.hxx:49 + rtl::OUStringLiteral<5> STR_TEMPLATE_NAME32_DEF +sfx2/source/appl/appdata.cxx:44 BasicDLL * pBasic -sfx2/source/appl/shutdownicon.hxx:108 +sfx2/source/appl/shutdownicon.hxx:53 + rtl::OUStringLiteral<24> WRITER_URL +sfx2/source/appl/shutdownicon.hxx:54 + rtl::OUStringLiteral<22> CALC_URL +sfx2/source/appl/shutdownicon.hxx:55 + rtl::OUStringLiteral<25> IMPRESS_URL +sfx2/source/appl/shutdownicon.hxx:56 + rtl::OUStringLiteral<35> IMPRESS_WIZARD_URL +sfx2/source/appl/shutdownicon.hxx:57 + rtl::OUStringLiteral<22> DRAW_URL +sfx2/source/appl/shutdownicon.hxx:58 + rtl::OUStringLiteral<22> MATH_URL +sfx2/source/appl/shutdownicon.hxx:59 + rtl::OUStringLiteral<38> BASE_URL +sfx2/source/appl/shutdownicon.hxx:60 + rtl::OUStringLiteral<21> STARTMODULE_URL +sfx2/source/appl/shutdownicon.hxx:106 _Bool bModalMode soltools/cpp/cpp.h:246 Nlist * kwdefined +starmath/inc/mathml/attribute.hxx:192 + SmMlAttributePos[1] MlAttributeListEmpty +starmath/inc/mathml/attribute.hxx:193 + SmMlAttributePos[1] MlAttributeListMath starmath/inc/mathml/mathmlMo.hxx:106 std::vector<moOperatorData> moOperatorDataDictionary starmath/inc/mathml/starmathdatabase.hxx:189 Color COL_SM_DIV_BLACK starmath/inc/mathml/starmathdatabase.hxx:190 Color COL_SM_DIV_BLUE -svl/source/items/style.cxx:59 +svl/source/items/style.cxx:60 (anonymous namespace)::DbgStyleSheetReferences aDbgStyleSheetReferences -sw/source/core/inc/swfont.hxx:989 +sw/source/core/inc/swfont.hxx:996 SvStatistics g_SvStat -sw/source/filter/ww8/ww8par6.cxx:1083 - sal_uInt16 [2] nLef -sw/source/filter/ww8/ww8par6.cxx:1084 - sal_uInt16 [2] nRig -sw/source/filter/ww8/ww8par6.cxx:1135 - sal_uInt16 [2] nTop -sw/source/filter/ww8/ww8par6.cxx:1136 - sal_uInt16 [2] nBot +sw/source/filter/ww8/ww8par6.cxx:1088 + sal_uInt16[2] nLef +sw/source/filter/ww8/ww8par6.cxx:1089 + sal_uInt16[2] nRig +sw/source/filter/ww8/ww8par6.cxx:1141 + sal_uInt16[2] nTop +sw/source/filter/ww8/ww8par6.cxx:1142 + sal_uInt16[2] nBot +unotools/source/config/eventcfg.cxx:377 + rtl::Reference<GlobalEventConfig> createImpl vcl/qa/cppunit/timer.cxx:54 (anonymous namespace)::WatchDog * aWatchDog -vcl/source/filter/FilterConfigCache.hxx:49 - char *[] InternalVectorFilterNameList -vcl/unx/gtk3/a11y/gtk3atkutil.cxx:447 +vcl/unx/gtk3/a11y/atkutil.cxx:444 (anonymous namespace)::WindowList g_aWindowList -xmloff/source/draw/sdpropls.cxx:365 - XMLPropertyMapEntry [5] aXMLSDPresPageProps_onlyHeadersFooter diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index 8d02798ea4e2..ff234150329f 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -21,8 +21,6 @@ #include <rtl/ustring.hxx> inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR = u"CharColor"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_THEME = u"CharColorTheme"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_TINT_OR_SHADE = u"CharColorTintOrShade"; inline constexpr OUStringLiteral UNO_NAME_CHAR_HEIGHT = u"CharHeight"; inline constexpr OUStringLiteral UNO_NAME_CHAR_POSTURE = u"CharPosture"; inline constexpr OUStringLiteral UNO_NAME_CHAR_SHADOWED = u"CharShadowed"; diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx index ea955437e472..b8f79d49a7af 100644 --- a/include/svl/inettype.hxx +++ b/include/svl/inettype.hxx @@ -103,7 +103,6 @@ inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_PCX = u"image/pcx"; inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_PNG = u"image/png"; inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_TIFF = u"image/tiff"; inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_BMP = u"image/x-MS-bmp"; -inline constexpr OUStringLiteral CONTENT_TYPE_STR_IMAGE_WEBP = u"image/webp"; inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MSG_RFC822 = u"message/rfc822"; inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MULTI_ALTERNATIVE = u"multipart/alternative"; inline constexpr OUStringLiteral CONTENT_TYPE_STR_INET_MULTI_DIGEST = u"multipart/digest"; diff --git a/sc/source/core/inc/sharedstringpoolpurge.hxx b/sc/source/core/inc/sharedstringpoolpurge.hxx index 76ed42b7e47e..87b11f3a057f 100644 --- a/sc/source/core/inc/sharedstringpoolpurge.hxx +++ b/sc/source/core/inc/sharedstringpoolpurge.hxx @@ -40,7 +40,6 @@ private: void cleanup(); std::vector<std::shared_ptr<svl::SharedStringPool>> mPoolsToPurge; Timer mTimer; - static SharedStringPoolPurge* self; DECL_LINK(timerHandler, Timer*, void); }; }
