diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-08 22:11:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-09 08:25:30 +0200 |
| commit | f2517e82904b92989ed7e38a070c18234f460b33 (patch) | |
| tree | 2b9bb63f3865670ad250f9fd706a577d1696d88f | |
| parent | 1159f58831c69680e9f10767d5358e13b66579dd (diff) | |
improve loplugin:unusedvarsglobal
to find any global variable, was checking the wrong property of
VarDecl
Change-Id: I454b4e0c1701bb0771768a1ee10cd738c4ab0726
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102278
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
48 files changed, 461 insertions, 636 deletions
diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index 5ecd5f30cc19..ac08f2c99cf6 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -146,28 +146,6 @@ const sal_uInt16 nRowWhichPairs[] = 0 }; -const sal_uInt16 nAreaWhichPairs[] = -{ - XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx - 0 -}; - -const sal_uInt16 nTextWhichPairs[] = -{ - CHARACTER_WHICHPAIRS, - SCHATTR_TEXT_START, SCHATTR_TEXT_END, - 0 -}; - -const sal_uInt16 nTextOrientWhichPairs[] = -{ - CHARACTER_WHICHPAIRS, - SCHATTR_TEXT_START, SCHATTR_TEXT_END, - 0 -}; - const sal_uInt16 nStatWhichPairs[]= { SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx @@ -196,13 +174,6 @@ const sal_uInt16 nLinePropertyWhichPairs[] = 0 }; -const sal_uInt16 nFillPropertyWhichPairs[] = -{ - XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx - SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx - 0 -}; - const sal_uInt16 nLineAndFillPropertyWhichPairs[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx @@ -211,15 +182,6 @@ const sal_uInt16 nLineAndFillPropertyWhichPairs[] = 0 }; -const sal_uInt16 nChartStyleWhichPairs[] = -{ - SCHATTR_STYLE_SHAPE, SCHATTR_STYLE_SHAPE, - SCHATTR_NUM_OF_LINES_FOR_BAR, SCHATTR_NUM_OF_LINES_FOR_BAR, - SCHATTR_SPLINE_ORDER, SCHATTR_SPLINE_ORDER, - SCHATTR_SPLINE_RESOLUTION, SCHATTR_SPLINE_RESOLUTION, - 0 -}; - const sal_uInt16 nRegressionCurveWhichPairs[] = { SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END, // 108 - 109 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index bea37d729506..126a041fe832 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2434,8 +2434,6 @@ void ChartView::impl_refreshAddIn() } } -static const char* envChartDummyFactory = getenv("CHART_DUMMY_FACTORY"); - void ChartView::createShapes() { SolarMutexGuard aSolarGuard; diff --git a/compilerplugins/clang/test/unusedvarsglobal.cxx b/compilerplugins/clang/test/unusedvarsglobal.cxx new file mode 100644 index 000000000000..98a9970a06df --- /dev/null +++ b/compilerplugins/clang/test/unusedvarsglobal.cxx @@ -0,0 +1,27 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +#include "config_clang.h" + +// CLANG_VERSION = older versions of clang need something different in getParentFunctionDecl +// WIN32 = TODO, see corresponding TODO in compilerplugins/clang/unusedfields.cxx +#if CLANG_VERSION < 110000 || defined _WIN32 +// expected-no-diagnostics +#else + +#include <rtl/ustring.hxx> + +namespace something +{ +// expected-error@+1 {{write [loplugin:unusedvarsglobal]}} +extern const OUStringLiteral literal1; +} +const OUStringLiteral something::literal1(u"xxx"); + +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/compilerplugins/clang/unusedvarsglobal.cxx b/compilerplugins/clang/unusedvarsglobal.cxx index 4619bd3617c5..508da0cb451f 100644 --- a/compilerplugins/clang/unusedvarsglobal.cxx +++ b/compilerplugins/clang/unusedvarsglobal.cxx @@ -31,32 +31,15 @@ /** This performs two analyses: - (1) look for unused fields - (2) look for fields that are write-only - -We dmp a list of calls to methods, and a list of field definitions. -Then we will post-process the 2 lists and find the set of unused methods. - -Be warned that it produces around 5G of log file. - -The process goes something like this: - $ make check - $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='UnusedVarsGlobal' check - $ ./compilerplugins/clang/UnusedVarsGlobal.py - -and then - $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir COMPILER_PLUGIN_TOOL='UnusedVarsGlobalremove' $dir; done -to auto-remove the method declarations - -Note that the actual process may involve a fair amount of undoing, hand editing, and general messing around -to get it to work :-) - + (1) look for unused global vars + (2) look for global vars that are write-only */ namespace { struct MyVarInfo { + const VarDecl* varDecl; std::string fieldName; std::string fieldType; std::string sourceLocation; @@ -196,25 +179,36 @@ void UnusedVarsGlobal::run() { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); - // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes - // writing to the same logfile - std::string output; - for (const MyVarInfo& s : readFromSet) - output += "read:\t" + s.sourceLocation + "\t" + s.fieldName + "\n"; - for (const MyVarInfo& s : writeToSet) - output += "write:\t" + s.sourceLocation + "\t" + s.fieldName + "\n"; - for (const MyVarInfo& s : definitionSet) - output - += "definition:\t" + s.fieldName + "\t" + s.fieldType + "\t" + s.sourceLocation + "\n"; - std::ofstream myfile; - myfile.open(WORKDIR "/loplugin.unusedvarsglobal.log", std::ios::app | std::ios::out); - myfile << output; - myfile.close(); + if (!isUnitTestMode()) + { + // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes + // writing to the same logfile + std::string output; + for (const MyVarInfo& s : readFromSet) + output += "read:\t" + s.sourceLocation + "\t" + s.fieldName + "\n"; + for (const MyVarInfo& s : writeToSet) + output += "write:\t" + s.sourceLocation + "\t" + s.fieldName + "\n"; + for (const MyVarInfo& s : definitionSet) + output += "definition:\t" + s.fieldName + "\t" + s.fieldType + "\t" + s.sourceLocation + + "\n"; + std::ofstream myfile; + myfile.open(WORKDIR "/loplugin.unusedvarsglobal.log", std::ios::app | std::ios::out); + myfile << output; + myfile.close(); + } + else + { + for (const MyVarInfo& s : readFromSet) + report(DiagnosticsEngine::Warning, "read", compat::getBeginLoc(s.varDecl)); + for (const MyVarInfo& s : writeToSet) + report(DiagnosticsEngine::Warning, "write", compat::getBeginLoc(s.varDecl)); + } } MyVarInfo UnusedVarsGlobal::niceName(const VarDecl* varDecl) { MyVarInfo aInfo; + aInfo.varDecl = varDecl; aInfo.fieldName = varDecl->getNameAsString(); // sometimes the name (if it's an anonymous thing) contains the full path of the build folder, which we don't need @@ -241,9 +235,7 @@ bool UnusedVarsGlobal::VisitVarDecl(const VarDecl* varDecl) varDecl = varDecl->getCanonicalDecl(); if (isa<ParmVarDecl>(varDecl)) return true; - if (varDecl->isConstexpr()) - return true; - if (varDecl->isExceptionVariable()) + if (!varDecl->hasGlobalStorage()) return true; if (!varDecl->getLocation().isValid() || ignoreLocation(varDecl)) return true; @@ -251,6 +243,17 @@ bool UnusedVarsGlobal::VisitVarDecl(const VarDecl* varDecl) if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(varDecl->getLocation()))) return true; + /** + If we have + const size_t NB_PRODUCTS = 3; + int DefaultProductDir[NB_PRODUCTS] = { 3, 3, 3 }; + clang will inline the constant "3" and never tell us that we are reading from NB_PRODUCTS, + so just ignore integer constants. + */ + auto varType = varDecl->getType(); + if (varType.isConstQualified() && varType->isIntegerType()) + return true; + auto initExpr = varDecl->getAnyInitializer(); if (initExpr && !isSomeKindOfZero(initExpr)) writeToSet.insert(niceName(varDecl)); @@ -267,9 +270,7 @@ bool UnusedVarsGlobal::VisitDeclRefExpr(const DeclRefExpr* declRefExpr) return true; if (isa<ParmVarDecl>(varDecl)) return true; - if (varDecl->isConstexpr()) - return true; - if (varDecl->isExceptionVariable()) + if (!varDecl->hasGlobalStorage()) return true; varDecl = varDecl->getCanonicalDecl(); if (!varDecl->getLocation().isValid() || ignoreLocation(varDecl)) diff --git a/compilerplugins/clang/unusedvarsglobal.untouched.results b/compilerplugins/clang/unusedvarsglobal.untouched.results index f8fcbf0f32a7..cdc7a6e89477 100644 --- a/compilerplugins/clang/unusedvarsglobal.untouched.results +++ b/compilerplugins/clang/unusedvarsglobal.untouched.results @@ -1,280 +1,38 @@ -basic/source/classes/sbxmod.cxx:1714 - (anonymous namespace)::ErrorHdlResetter aErrHdl canvas/workben/canvasdemo.cxx:672 (anonymous namespace)::DemoApp aApp -chart2/source/view/main/DrawModelWrapper.cxx:82 - E3dObjFactory aObjFactory connectivity/source/drivers/evoab2/EApi.h:52 gconstpointer (*)(EContact *, EContactField) e_contact_get_const -connectivity/source/drivers/postgresql/pq_baseresultset.hxx:52 - sal_Int32 BASERESULTSET_CURSOR_NAME -connectivity/source/drivers/postgresql/pq_preparedstatement.hxx:55 - sal_Int32 PREPARED_STATEMENT_CURSOR_NAME -connectivity/source/drivers/postgresql/pq_statement.hxx:53 - sal_Int32 STATEMENT_CURSOR_NAME cppu/source/uno/check.cxx:315 (anonymous namespace)::BinaryCompatible_Impl aTest -dbaccess/source/filter/xml/xmlfilter.cxx:230 - dbaxml::(anonymous namespace)::FocusWindowWaitGuard aWindowFocusGuard -dbaccess/source/ui/inc/TypeInfo.hxx:31 - sal_uInt16 TYPE_UNKNOWN -desktop/source/app/sofficemain.cxx:71 - desktop::Desktop aDesktop -desktop/source/splash/unxsplash.hxx:33 - desktop::UnxSplashScreen * m_pINSTANCE -desktop/source/splash/unxsplash.hxx:35 - osl::Mutex m_aMutex -desktop/unx/source/splashx.c:301 - uint32_t tmp -desktop/unx/source/splashx.c:315 - uint32_t tmp -desktop/unx/source/splashx.c:334 - uint32_t tmp -desktop/unx/source/splashx.c:343 - uint32_t tmp -drawinglayer/source/tools/emfppen.hxx:31 - sal_uInt32 EmfPlusLineJoinTypeMiter -drawinglayer/source/tools/emfppen.hxx:36 - sal_Int32 EmfPlusLineStyleSolid -extensions/source/scanner/sane.cxx:712 - int __d0 -extensions/source/scanner/sane.cxx:712 - int __d1 -filter/source/pdf/pdffilter.cxx:222 - (anonymous namespace)::FocusWindowWaitCursor aCur framework/source/services/ContextChangeEventMultiplexer.cxx:381 framework::(anonymous namespace)::Hook g_hook -framework/source/uiconfiguration/windowstateconfiguration.cxx:63 - sal_Int16 PROPERTY_LOCKED hwpfilter/source/nodes.h:92 int count -i18nlangtag/source/languagetag/languagetag.cxx:848 - Runner aRunner -include/editeng/flditem.hxx:43 - sal_Int32 UNKNOWN_FIELD -include/oox/helper/helper.hxx:87 - sal_Int16 API_LINE_SOLID -include/oox/helper/helper.hxx:92 - sal_Int16 API_LINE_NONE -include/oox/helper/helper.hxx:98 - sal_Int16 API_ESCAPE_NONE -include/oox/ole/axcontrol.hxx:123 - sal_Int32 AX_PICALIGN_TOPLEFT -include/vcl/EnumContext.hxx:139 - sal_Int32 OptimalMatch -lotuswordpro/source/filter/LotusWordProImportFilter.cxx:74 - uno::Reference<XDocumentHandler> xHandler -lotuswordpro/source/filter/lwpsilverbullet.hxx:71 - sal_uInt16 NUMCHAR_none -oox/source/dump/oledumper.cxx:163 - sal_uInt16 OLEPROP_TYPE_SIMPLE -oox/source/ole/olehelper.cxx:67 - sal_uInt32 OLE_COLORTYPE_CLIENT pyuno/source/loader/pyuno_loader.cxx:240 pyuno_loader::(anonymous namespace)::PythonInit s_Init -pyuno/source/module/pyuno.cxx:1505 - pyuno::Runtime runtime pyuno/source/module/pyuno_gc.cxx:45 pyuno::(anonymous namespace)::StaticDestructorGuard guard -pyuno/source/module/pyuno_struct.cxx:251 - pyuno::Runtime runtime sal/osl/all/utility.cxx:45 osl::(anonymous namespace)::OGlobalTimer aGlobalTimer sal/qa/osl/file/osl_File.cxx:5199 (anonymous namespace)::GlobalObject theGlobalObject -sal/qa/osl/pipe/osl_Pipe.cxx:875 - osl_StreamPipe::(anonymous namespace)::Pipe_DataSink_Thread myDataSinkThread -sal/qa/OStringBuffer/rtl_String_Const.h:118 - sal_Int32 kTestStr25Len sal/rtl/cmdargs.cxx:46 (anonymous namespace)::ArgHolder argHolder -salhelper/qa/test_api.cxx:171 - salhelper::ORealDynamicLoader * p -sc/qa/unit/tiledrendering/tiledrendering.cxx:612 - (anonymous namespace)::ViewCallback aView2 -sc/qa/unit/tiledrendering/tiledrendering.cxx:651 - (anonymous namespace)::ViewCallback aView2 -sc/qa/unit/tiledrendering/tiledrendering.cxx:746 - (anonymous namespace)::ViewCallback aView1 -sc/qa/unit/tiledrendering/tiledrendering.cxx:758 - (anonymous namespace)::ViewCallback aView2 -sc/qa/unit/tiledrendering/tiledrendering.cxx:780 - (anonymous namespace)::ViewCallback aView1 -sc/qa/unit/tiledrendering/tiledrendering.cxx:1152 - (anonymous namespace)::ViewCallback aView1 -sc/qa/unit/tiledrendering/tiledrendering.cxx:1158 - (anonymous namespace)::ViewCallback aView2 -sc/qa/unit/tiledrendering/tiledrendering.cxx:1216 - (anonymous namespace)::ViewCallback aView1 -sc/qa/unit/tiledrendering/tiledrendering.cxx:1222 - (anonymous namespace)::ViewCallback aView2 -sc/qa/unit/ucalc_sort.cxx:1027 - SortRefNoUpdateSetter aUpdateSet -sc/qa/unit/ucalc_sort.cxx:1336 - SortRefNoUpdateSetter aUpdateSet -sc/qa/unit/ucalc_sort.cxx:1474 - SortRefNoUpdateSetter aUpdateSet -sc/qa/unit/ucalc_sort.cxx:1674 - SortRefNoUpdateSetter aUpdateSet -sc/source/filter/inc/biffhelper.hxx:401 - sal_uInt16 BIFF2_ID_DIMENSION -sc/source/filter/inc/biffhelper.hxx:539 - sal_uInt16 BIFF_ID_OBJEND -sc/source/filter/inc/biffhelper.hxx:575 - sal_uInt8 BIFF_DATATYPE_EMPTY -sc/source/filter/inc/biffhelper.hxx:581 - sal_uInt8 BIFF_BOOLERR_BOOL -sc/source/filter/inc/defnamesbuffer.hxx:37 - sal_Unicode BIFF_DEFNAME_CONSOLIDATEAREA -sc/source/filter/inc/formulabase.hxx:61 - sal_uInt8 BIFF_TOKID_NONE -sc/source/filter/inc/formulabase.hxx:96 - sal_uInt8 BIFF_TOKID_ARRAY -sc/source/filter/inc/formulabase.hxx:121 - sal_uInt8 BIFF_TOK_ARRAY_DOUBLE -sc/source/filter/inc/formulabase.hxx:139 - sal_uInt8 BIFF_TOK_ATTR_SPACE_SP -sc/source/filter/inc/xlchart.hxx:198 - sal_uInt16 EXC_CHFRBLOCK_FRAME_STANDARD -sc/source/filter/inc/xlchart.hxx:227 - sal_uInt16 EXC_CHSERIES_DATE -sc/source/filter/inc/xlchart.hxx:335 - sal_uInt8 EXC_CHLEGEND_CLOSE -sc/source/filter/inc/xlchart.hxx:386 - sal_uInt16 EXC_CHCHARTLINE_DROP -sc/source/filter/inc/xlchart.hxx:453 - sal_uInt16 EXC_CHDEFTEXT_TEXTLABEL -sc/source/filter/inc/xlchart.hxx:641 - sal_uInt16 EXC_CHFRAMEPOS_POINTS -sc/source/filter/inc/xlchart.hxx:682 - sal_uInt8 EXC_CHSERERR_END_BLANK -sc/source/filter/inc/xlconst.hxx:127 - sal_Int32 EXC_RK_DBL -sc/source/filter/inc/xlcontent.hxx:40 - sal_uInt16 EXC_FILEPASS_BIFF5 -sc/source/filter/inc/xlescher.hxx:99 - sal_uInt8 EXC_OBJ_ARROW_NONE -sc/source/filter/inc/xlescher.hxx:105 - sal_uInt8 EXC_OBJ_ARROW_NARROW -sc/source/filter/inc/xlescher.hxx:197 - sal_uInt16 EXC_OBJ_DROPDOWN_LISTBOX -sc/source/filter/inc/xlname.hxx:48 - sal_Unicode EXC_BUILTIN_CONSOLIDATEAREA -sc/source/filter/oox/externallinkbuffer.cxx:52 - sal_uInt16 BIFF12_EXTERNALBOOK_BOOK -sc/source/filter/oox/stylesbuffer.cxx:135 - sal_uInt8 BIFF12_COLOR_AUTO -sc/source/filter/oox/stylesbuffer.cxx:163 - sal_uInt16 BIFF12_DXF_FILL_PATTERN -sc/source/filter/oox/stylesbuffer.cxx:203 - sal_uInt8 BIFF_FONTUNDERL_NONE -sc/source/ui/vba/excelvbahelper.cxx:160 - ooo::vba::excel::(anonymous namespace)::PasteCellsWarningReseter resetWarningBox -sc/source/ui/vba/excelvbahelper.cxx:211 - ooo::vba::excel::(anonymous namespace)::PasteCellsWarningReseter resetWarningBox -sd/qa/unit/tiledrendering/tiledrendering.cxx:1462 - (anonymous namespace)::ViewCallback aView1 -sd/qa/unit/tiledrendering/tiledrendering.cxx:1915 - (anonymous namespace)::ViewCallback aView1 -sd/qa/unit/tiledrendering/tiledrendering.cxx:1923 - (anonymous namespace)::ViewCallback aView2 -sd/source/ui/animations/CustomAnimationDialog.hxx:29 - sal_Int32 nHandleSound -sd/source/ui/inc/MasterPageObserver.hxx:79 - osl::Mutex maMutex -sd/source/ui/sidebar/PanelFactory.cxx:47 - Reference<lang::XEventListener> mxControllerDisposeListener -sfx2/source/appl/shutdownicon.cxx:663 - sal_Int32 PROPHANDLE_TERMINATEVETOSTATE -sfx2/source/doc/objstor.cxx:573 - FontLockGuard aFontLockGuard -sfx2/source/view/lokhelper.cxx:127 - (anonymous namespace)::DisableCallbacks dc soltools/cpp/cpp.h:239 int Lflag soltools/mkdepend/parse.c:40 symhash * maininclist soltools/mkdepend/pr.c:34 int width -starmath/source/mathmlimport.cxx:2717 - uno::Reference<beans::XPropertySet> xInfoSet -svl/qa/unit/items/test_IndexedStyleSheets.cxx:74 - svl::IndexedStyleSheets iss -svtools/source/control/inettbc.cxx:87 - osl::Mutex * pDirMutex -svx/source/gallery2/galctrl.cxx:244 - GalleryProgress aProgress svx/source/gengal/gengal.cxx:323 (anonymous namespace)::GalApp aGalApp -sw/inc/calc.hxx:88 - char [] sCalc_Tdif -sw/inc/poolfmt.hxx:64 - sal_uInt16 POOL_FMT -sw/inc/swtypes.hxx:101 - SwPathFinder * pPathFinder -sw/inc/viewsh.hxx:167 - vcl::DeleteOnDeinit<VclPtr<vcl::Window> > mpCareWindow -sw/qa/extras/ooxmlexport/ooxmlexport8.cxx:405 - BorderTest borderTest -sw/qa/extras/rtfexport/rtfexport2.cxx:548 - BorderTest borderTest -sw/qa/extras/ww8export/ww8export.cxx:266 - BorderTest borderTest -sw/source/core/layout/paintfrm.cxx:3922 - (anonymous namespace)::BorderLinesGuard blg -sw/source/core/text/frmform.cxx:1801 - (anonymous namespace)::FormatLevel aLevel -sw/source/core/view/viewsh.cxx:706 - SwSaveSetLRUOfst aSaveLRU -sw/source/core/view/viewsh.cxx:983 - SwSaveSetLRUOfst aSaveLRU -sw/source/filter/basflt/shellio.cxx:733 - SwPauseThreadStarting aPauseThreadStarting -sw/source/filter/html/swhtml.cxx:5596 - (anonymous namespace)::FontCacheGuard aFontCacheGuard -sw/source/filter/ww8/rtfsdrexport.cxx:489 - char *[] pShapeTypes -sw/source/filter/ww8/ww8par.cxx:6264 - (anonymous namespace)::FontCacheGuard aFontCacheGuard -sw/source/filter/xml/xmlexp.cxx:98 - SwPauseThreadStarting aPauseThreadStarting -sw/source/uibase/inc/initui.hxx:33 - SwThesaurus * pThes -sw/source/uibase/lingu/hhcwrp.cxx:123 - (anonymous namespace)::SwKeepConversionDirectionStateContext aContext -sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx:326 - svx::sidebar::TreeNode aChild vcl/backendtest/VisualBackendTest.cxx:745 (anonymous namespace)::VisualBackendTestApp aApplication -vcl/inc/driverblocklist.hxx:96 - uint64_t allDriverVersions -vcl/qa/cppunit/BitmapScaleTest.cxx:288 - BitmapSymmetryCheck aBitmapSymmetryCheck -vcl/source/outdev/font.cxx:156 - (anonymous namespace)::UpdateFontsGuard aUpdateFontsGuard vcl/source/uipreviewer/previewer.cxx:113 (anonymous namespace)::UIPreviewApp aApp -vcl/unx/generic/app/saldata.cxx:314 - int __d0 -vcl/unx/generic/app/saldata.cxx:314 - int __d1 -vcl/unx/generic/app/saldata.cxx:315 - int __d1 -vcl/unx/generic/app/saldata.cxx:315 - int __d0 vcl/workben/icontest.cxx:216 (anonymous namespace)::IconTestApp aApp vcl/workben/mtfdemo.cxx:162 (anonymous namespace)::DemoMtfApp aApp vcl/workben/vcldemo.cxx:2445 (anonymous namespace)::DemoApp aApp -writerfilter/source/dmapper/DomainMapperTableHandler.cxx:825 - std::optional<PropertyMap::Property> oRowCellBorder -writerfilter/source/dmapper/TagLogger.hxx:35 - tools::SvRef<TagLogger> instance -xmloff/inc/PageMasterStyleMap.hxx:193 - XMLPropertyMapEntry [] aXMLPageMasterHeaderImportStyleMap -xmloff/inc/PageMasterStyleMap.hxx:194 - XMLPropertyMapEntry [] aXMLPageMasterFooterImportStyleMap -xmloff/inc/XMLChartPropertySetMapper.hxx:28 - XMLPropertyMapEntry [] aXMLChartPropMap diff --git a/compilerplugins/clang/unusedvarsglobal.writeonly.results b/compilerplugins/clang/unusedvarsglobal.writeonly.results new file mode 100644 index 000000000000..92413e328e2c --- /dev/null +++ b/compilerplugins/clang/unusedvarsglobal.writeonly.results @@ -0,0 +1,392 @@ +basctl/source/basicide/localizationmgr.cxx:52 + rtl::OUStringLiteral aSemi +chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:149 + sal_uInt16 [7] nAreaWhichPairs +chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:157 + sal_uInt16 [7] nTextWhichPairs +chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:164 + sal_uInt16 [7] nTextOrientWhichPairs +chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:199 + sal_uInt16 [5] nFillPropertyWhichPairs +chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx:214 + sal_uInt16 [9] nChartStyleWhichPairs +chart2/source/view/inc/ViewDefines.hxx:30 + double ZDIRECTION +chart2/source/view/main/ChartView.cxx:2437 + char * envChartDummyFactory +connectivity/source/drivers/hsqldb/HDriver.cxx:345 + Reference<class com::sun::star::frame::XTerminateListener> s_xTerminateListener +connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx:38 + std::string wild +cppuhelper/source/servicemanager.cxx:1977 + std::vector<css::uno::Mapping> maMaps +cui/source/inc/cuitabarea.hxx:491 + sal_uInt16 [] pBitmapRanges +dbaccess/source/ui/browser/genericcontroller.cxx:465 + sal_Int32 s_nRecursions +dbaccess/source/ui/inc/TokenWriter.hxx:142 + sal_Int16 [7] nDefaultFontSize +dbaccess/source/ui/inc/TokenWriter.hxx:144 + sal_Int16 [7] nFontSize +desktop/source/app/langselect.cxx:50 + rtl::OUString foundLocale +hwpfilter/source/grammar.cxx:399 + int yynerrs +hwpfilter/source/hbox.h:67 + int boxCount +hwpfilter/source/ksc5601.h:184 + hchar [4888] ksc5601_2uni_page4a +hwpfilter/source/nodes.h:98 + 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 + int yydebug +include/svx/def3d.hxx:26 + double EPSILON +include/svx/xoutbmp.hxx:57 + GraphicFilter * pGrfFilter +include/vcl/animate/Animation.hxx:96 + sal_uLong mnAnimCount +libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:31 + gpointer gtv_comments_sidebar_parent_class +libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:61 + gpointer gtv_lok_dialog_parent_class +lotuswordpro/inc/lwptools.hxx:76 + double INCHT_PER_CM +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 +sal/qa/osl/file/osl_File_Const.h:60 + char [11] pBuffer_Number +sal/qa/osl/file/osl_File_Const.h:61 + char [1] pBuffer_Blank +sal/qa/osl/file/osl_File_Const.h:126 + rtl::OUString aCanURL2 +sal/qa/osl/file/osl_File_Const.h:128 + rtl::OUString aCanURL3 +sal/qa/osl/file/osl_File_Const.h:141 + rtl::OUString aRelURL1 +sal/qa/osl/file/osl_File_Const.h:142 + rtl::OUString aRelURL2 +sal/qa/osl/file/osl_File_Const.h:143 + rtl::OUString aRelURL3 +sal/qa/osl/file/osl_File_Const.h:157 + rtl::OUString aSysPathLnk +sal/qa/osl/file/osl_File_Const.h:158 + rtl::OUString aFifoSys +sal/qa/osl/file/osl_File_Const.h:165 + rtl::OUString aTypeURL1 +sal/qa/osl/file/osl_File_Const.h:166 + rtl::OUString aTypeURL2 +sal/qa/osl/file/osl_File_Const.h:167 + rtl::OUString aTypeURL3 +sal/qa/osl/file/osl_File_Const.h:182 + rtl::OUString aVolURL2 +sal/qa/osl/file/osl_File_Const.h:184 + rtl::OUString aVolURL3 +sal/qa/osl/file/osl_File_Const.h:185 + rtl::OUString aVolURL4 +sal/qa/osl/file/osl_File_Const.h:186 + rtl::OUString aVolURL5 +sal/qa/osl/file/osl_File_Const.h:187 + rtl::OUString aVolURL6 +sal/qa/osl/security/osl_Security_Const.h:48 + char [17] pTestString +sal/qa/OStringBuffer/rtl_String_Const.h:275 + sal_Unicode [3] uTestStr31 +sal/qa/OStringBuffer/rtl_String_Const.h:276 + sal_Unicode [4] uTestStr32 +sal/qa/OStringBuffer/rtl_String_Const.h:297 + sal_Int32 [5] kInt32MaxNums +sal/qa/OStringBuffer/rtl_String_Const.h:306 + sal_Int64 [7] kInt64MaxNums +sal/qa/OStringBuffer/rtl_String_Const.h:335 + double [24] expValDouble +sal/qa/OStringBuffer/rtl_String_Const.h:345 + float [22] expValFloat +sal/qa/OStringBuffer/rtl_String_Const.h:355 + sal_Unicode [15] expValChar +sal/qa/OStringBuffer/rtl_String_Const.h:364 + sal_Unicode [6] input1Default +sal/qa/OStringBuffer/rtl_String_Const.h:368 + sal_Int32 [6] input2Default +sal/qa/OStringBuffer/rtl_String_Const.h:372 + sal_Int32 [6] expValDefault +sal/qa/OStringBuffer/rtl_String_Const.h:378 + sal_Unicode [10] input1Normal +sal/qa/OStringBuffer/rtl_String_Const.h:382 + sal_Int32 [10] input2Normal +sal/qa/OStringBuffer/rtl_String_Const.h:386 + sal_Int32 [10] expValNormal +sal/qa/OStringBuffer/rtl_String_Const.h:392 + sal_Unicode [5] input1lastDefault +sal/qa/OStringBuffer/rtl_String_Const.h:396 + sal_Int32 [5] input2lastDefault +sal/qa/OStringBuffer/rtl_String_Const.h:400 + sal_Int32 [5] expVallastDefault +sal/qa/OStringBuffer/rtl_String_Const.h:406 + sal_Unicode [8] input1lastNormal +sal/qa/OStringBuffer/rtl_String_Const.h:410 + sal_Int32 [8] input2lastNormal +sal/qa/OStringBuffer/rtl_String_Const.h:414 + sal_Int32 [8] expVallastNormal +sal/qa/OStringBuffer/rtl_String_Const.h:420 + sal_Int32 [6] input2StrDefault +sal/qa/OStringBuffer/rtl_String_Const.h:424 + sal_Int32 [6] expValStrDefault +sal/qa/OStringBuffer/rtl_String_Const.h:430 + sal_Int32 [9] input2StrNormal +sal/qa/OStringBuffer/rtl_String_Const.h:434 + sal_Int32 [9] expValStrNormal +sal/qa/OStringBuffer/rtl_String_Const.h:440 + sal_Int32 [6] input2StrLastDefault +sal/qa/OStringBuffer/rtl_String_Const.h:444 + sal_Int32 [6] expValStrLastDefault +sal/qa/OStringBuffer/rtl_String_Const.h:450 + 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 dummy +sc/inc/global.hxx:514 + std::unique_ptr<SvxBrushItem> xEmbeddedBrushItem +sc/source/core/data/drwlayer.cxx:80 + E3dObjFactory * pF3d +sc/source/core/opencl/opinlinefun_finacial.cxx:43 + std::string GetPMTDecl +sc/source/core/opencl/opinlinefun_finacial.cxx:46 + std::string GetPMT +sc/source/core/opencl/opinlinefun_finacial.cxx:309 + std::string ScaDate2Decl +sc/source/core/opencl/opinlinefun_finacial.cxx:313 + std::string ScaDate2 +sc/source/filter/inc/imp_op.hxx:88 + double fExcToTwips +sc/source/filter/inc/xlstream.hxx:33 + ErrCode EXC_ENCR_ERROR_WRONG_PASS +sc/source/ui/inc/content.hxx:63 + _Bool bIsInDrag +sc/source/ui/inc/viewfunc.hxx:376 + _Bool bPasteIsDrop +sd/source/ui/inc/framework/FrameworkHelper.hxx:64 + rtl::OUString msSidebarPaneURL +sd/source/ui/inc/framework/FrameworkHelper.hxx:83 + rtl::OUString msAllMasterPagesTaskPanelURL +sd/source/ui/inc/framework/FrameworkHelper.hxx:84 + rtl::OUString msRecentMasterPagesTaskPanelURL +sd/source/ui/inc/framework/FrameworkHelper.hxx:85 + rtl::OUString msUsedMasterPagesTaskPanelURL +sd/source/ui/inc/framework/FrameworkHelper.hxx:86 + rtl::OUString msLayoutTaskPanelURL +sd/source/ui/inc/framework/FrameworkHelper.hxx:87 + rtl::OUString msTableDesignPanelURL +sd/source/ui/inc/framework/FrameworkHelper.hxx:88 + rtl::OUString msCustomAnimationTaskPanelURL +sd/source/ui/inc/framework/FrameworkHelper.hxx:89 + rtl::OUString msSlideTransitionTaskPanelURL +sd/source/ui/inc/framework/FrameworkHelper.hxx:101 + rtl::OUStringLiteral msModuleControllerService +sd/source/ui/inc/framework/FrameworkHelper.hxx:102 + rtl::OUStringLiteral msConfigurationControllerService +sd/source/ui/inc/unokywds.hxx:26 + char [6] sUNO_PseudoSheet_Title +sd/source/ui/inc/unokywds.hxx:27 + char [9] sUNO_PseudoSheet_SubTitle +sd/source/ui/inc/unokywds.hxx:29 + char [18] sUNO_PseudoSheet_Background_Objects +sd/source/ui/inc/unokywds.hxx:30 + char [6] sUNO_PseudoSheet_Notes +sd/source/ui/inc/unokywds.hxx:31 + char [9] sUNO_PseudoSheet_Outline1 +sd/source/ui/inc/unokywds.hxx:32 + char [9] sUNO_PseudoSheet_Outline2 +sd/source/ui/inc/unokywds.hxx:33 + char [9] sUNO_PseudoSheet_Outline3 +sd/source/ui/inc/unokywds.hxx:34 + char [9] sUNO_PseudoSheet_Outline4 +sd/source/ui/inc/unokywds.hxx:35 + char [9] sUNO_PseudoSheet_Outline5 +sd/source/ui/inc/unokywds.hxx:36 + char [9] sUNO_PseudoSheet_Outline6 +sd/source/ui/inc/unokywds.hxx:37 + char [9] sUNO_PseudoSheet_Outline7 +sd/source/ui/inc/unokywds.hxx:38 + char [9] sUNO_PseudoSheet_Outline8 +sd/source/ui/inc/unokywds.hxx:39 + char [9] sUNO_PseudoSheet_Outline9 +sd/source/ui/inc/unokywds.hxx:49 + char [6] sUNO_shape_style +sd/source/ui/inc/unokywds.hxx:50 + char [10] sUNO_shape_layername +sd/source/ui/inc/unokywds.hxx:51 + char [7] sUNO_shape_zorder +sd/source/ui/inc/unokywds.hxx:54 + char [31] sUNO_Service_StyleFamily +sd/source/ui/inc/unokywds.hxx:55 + char [33] sUNO_Service_StyleFamilies +sd/source/ui/inc/unokywds.hxx:56 + char [25] sUNO_Service_Style +sd/source/ui/inc/unokywds.hxx:58 + char [36] sUNO_Service_LineProperties +sd/source/ui/inc/unokywds.hxx:59 + char [39] sUNO_Service_ParagraphProperties +sd/source/ui/inc/unokywds.hxx:60 + char [39] sUNO_Service_CharacterProperties +sd/source/ui/inc/unokywds.hxx:61 + char [26] sUNO_Service_Text +sd/source/ui/inc/unokywds.hxx:62 + char [36] sUNO_Service_TextProperties +sd/source/ui/inc/unokywds.hxx:63 + char [38] sUNO_Service_ShadowProperties +sd/source/ui/inc/unokywds.hxx:64 + char [41] sUNO_Service_ConnectorProperties +sd/source/ui/inc/unokywds.hxx:65 + char [39] sUNO_Service_MeasureProperties +sd/source/ui/inc/unokywds.hxx:67 + char [40] sUNO_Service_GraphicObjectShape +sd/source/ui/inc/unokywds.hxx:74 + char [11] sUNO_Prop_Background +sd/source/ui/inc/unokywds.hxx:78 + char [7] sUNO_Prop_Aspect +sd/source/ui/inc/unokywds.hxx:100 + char [12] sUNO_View_IsQuickEdit +sd/source/ui/inc/unokywds.hxx:103 + char [15] sUNO_View_IsDragWithCopy +sd/source/ui/inc/unokywds.hxx:105 + char [9] sUNO_View_DrawMode +sd/source/ui/inc/unokywds.hxx:106 + char [16] sUNO_View_PreviewDrawMode +sd/source/ui/inc/unokywds.hxx:107 + char [24] sUNO_View_IsShowPreviewInPageMode +sd/source/ui/inc/unokywds.hxx:108 + char [30] sUNO_View_IsShowPreviewInMasterPageMode +sd/source/ui/inc/unokywds.hxx:109 + char [28] sUNO_View_SetShowPreviewInOutlineMode +sd/source/ui/inc/unokywds.hxx:114 + char [8] sUNO_View_VisArea +sd/source/ui/inc/unokywds.hxx:123 + char [19] sUNO_View_IsSnapLinesVisible +sd/source/ui/inc/unokywds.hxx:124 + char [14] sUNO_View_IsDragStripes +sd/source/ui/inc/unokywds.hxx:127 + char [23] sUNO_View_IsMarkedHitMovesAlways +sd/source/ui/inc/unokywds.hxx:130 + char [12] sUNO_View_IsLineDraft +sd/source/ui/inc/unokywds.hxx:131 + char [12] sUNO_View_IsFillDraft +sd/source/ui/inc/unokywds.hxx:132 + char [12] sUNO_View_IsTextDraft +sd/source/ui/inc/unokywds.hxx:133 + char [12] sUNO_View_IsGrafDraft +sdext/source/presenter/PresenterHelper.hxx:34 + rtl::OUString msCenterPaneURL +sdext/source/presenter/PresenterHelper.hxx:38 + rtl::OUString msPresenterScreenURL +sdext/source/presenter/PresenterHelper.hxx:39 + rtl::OUString msSlideSorterURL +sdext/source/presenter/PresenterPaneFactory.hxx:57 + rtl::OUStringLiteral msHelpPaneURL +sdext/source/presenter/PresenterPaneFactory.hxx:58 + rtl::OUStringLiteral msOverlayPaneURL +sfx2/source/appl/appdata.cxx:48 + BasicDLL * pBasic +sfx2/source/appl/shutdownicon.hxx:107 + _Bool bModalMode +soltools/cpp/cpp.h:246 + Nlist * kwdefined +svl/source/items/style.cxx:61 + (anonymous namespace)::DbgStyleSheetReferences aDbgStyleSheetReferences +svtools/source/config/printoptions.cxx:60 + SvtPrintOptions_Impl * pPrinterOptionsDataContainer +svtools/source/config/printoptions.cxx:61 + SvtPrintOptions_Impl * pPrintFileOptionsDataContainer +sw/source/core/inc/swfont.hxx:989 + SvStatistics g_SvStat +sw/source/filter/html/css1kywd.hxx:27 + char *const sCSS1_import +sw/source/filter/html/css1kywd.hxx:31 + char *const sCSS1_important +sw/source/filter/html/css1kywd.hxx:42 + char *const sCSS1_rgb +sw/source/filter/html/css1kywd.hxx:50 + char *const sCSS1_UNIT_em +sw/source/filter/html/css1kywd.hxx:51 + char *const sCSS1_UNIT_ex +sw/source/filter/html/css1kywd.hxx:89 + char *const sCSS1_PV_lighter +sw/source/filter/html/css1kywd.hxx:90 + char *const sCSS1_PV_bolder +sw/source/filter/html/css1kywd.hxx:94 + char *const sCSS1_PV_xx_small +sw/source/filter/html/css1kywd.hxx:95 + char *const sCSS1_PV_x_small +sw/source/filter/html/css1kywd.hxx:96 + char *const sCSS1_PV_small +sw/source/filter/html/css1kywd.hxx:97 + char *const sCSS1_PV_medium +sw/source/filter/html/css1kywd.hxx:98 + char *const sCSS1_PV_large +sw/source/filter/html/css1kywd.hxx:99 + char *const sCSS1_PV_x_large +sw/source/filter/html/css1kywd.hxx:100 + char *const sCSS1_PV_xx_large +sw/source/filter/html/css1kywd.hxx:102 + char *const sCSS1_PV_larger +sw/source/filter/html/css1kywd.hxx:103 + char *const sCSS1_PV_smaller +sw/source/filter/html/css1kywd.hxx:117 + char *const sCSS1_PV_repeat_x +sw/source/filter/html/css1kywd.hxx:118 + char *const sCSS1_PV_repeat_y +sw/source/filter/html/css1kywd.hxx:181 + char *const sCSS1_PV_thin +sw/source/filter/html/css1kywd.hxx:183 + char *const sCSS1_PV_thick +sw/source/filter/html/css1kywd.hxx:209 + char *const sCSS1_PV_relative +sw/source/filter/html/css1kywd.hxx:210 + char *const sCSS1_PV_static +sw/source/filter/html/css1kywd.hxx:237 + char *const sCSS1_class_abs_pos +sw/source/filter/ww8/ww8par6.cxx:1069 + sal_uInt16 [2] nLef +sw/source/filter/ww8/ww8par6.cxx:1070 + sal_uInt16 [2] nRig +sw/source/filter/ww8/ww8par6.cxx:1121 + sal_uInt16 [2] nTop +sw/source/filter/ww8/ww8par6.cxx:1122 + sal_uInt16 [2] nBot +sw/source/filter/ww8/ww8scan.hxx:50 + char [8] aTextBox +vcl/inc/unx/gtk/gtkgdi.hxx:166 + GtkStyleContext * mpSpinEntryStyle +vcl/qa/cppunit/timer.cxx:54 + (anonymous namespace)::WatchDog * aWatchDog +vcl/unx/gtk3/a11y/gtk3atkutil.cxx:508 + (anonymous namespace)::WindowList g_aWindowList +xmloff/source/chart/XMLSymbolImageContext.cxx:46 + SvXMLTokenMapEntry [5] aSymbolImageAttrTokenMap +xmloff/source/draw/sdpropls.hxx:40 + XMLPropertyMapEntry [] aXMLSDPresPageProps_onlyHeadersFooter +xmloff/source/style/DashStyle.cxx:58 + SvXMLTokenMapEntry [9] aDashStyleAttrTokenMap +xmloff/source/style/XMLBackgroundImageContext.cxx:174 + SvXMLTokenMap aTokenMap +xmloff/source/style/xmlstyle.cxx:62 + SvXMLTokenMapEntry [16] aStyleStylesElemTokenMap +xmloff/source/style/xmltabi.cxx:84 + SvXMLTokenMap aTokenMap +xmloff/source/text/txtdropi.cxx:65 + SvXMLTokenMap aTokenMap +xmloff/source/text/txtimp.cxx:414 + SvXMLTokenMapEntry [9] aTextMasterPageElemTokenMap diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index fe16ad2c3bf2..09b9b8becdba 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -488,7 +488,6 @@ public: class SvxBitmapTabPage : public SfxTabPage { - static const sal_uInt16 pBitmapRanges[]; private: const SfxItemSet& m_rOutAttrs; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index c679339199db..9797c73b1da0 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -66,13 +66,6 @@ enum TileOffset } -const sal_uInt16 SvxBitmapTabPage::pBitmapRanges[] = -{ - SID_ATTR_TRANSFORM_WIDTH, - SID_ATTR_TRANSFORM_HEIGHT, - 0 -}; - SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) : SfxTabPage(pPage, pController, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", &rInAttrs) , m_rOutAttrs(rInAttrs) diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index ecf8f9442e58..ef8579d4daf8 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -138,10 +138,6 @@ namespace dbaui const sal_Int16 nIndentMax = 23; class OHTMLImportExport : public ODatabaseImportExport { - // default HtmlFontSz[1-7] - static const sal_Int16 nDefaultFontSize[SBA_HTML_FONTSIZES]; - // HtmlFontSz[1-7] in s*3.ini [user] - static sal_Int16 nFontSize[SBA_HTML_FONTSIZES]; static const sal_Int16 nCellSpacing; static const char sIndentSource[]; char sIndent[nIndentMax+1]; diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 3d73e9427b0e..5b1be584b18f 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -566,14 +566,6 @@ bool ORTFImportExport::Read() return eState != SvParserState::Error; } -const sal_Int16 OHTMLImportExport::nDefaultFontSize[SBA_HTML_FONTSIZES] = -{ - HTMLFONTSZ1_DFLT, HTMLFONTSZ2_DFLT, HTMLFONTSZ3_DFLT, HTMLFONTSZ4_DFLT, - HTMLFONTSZ5_DFLT, HTMLFONTSZ6_DFLT, HTMLFONTSZ7_DFLT -}; - -sal_Int16 OHTMLImportExport::nFontSize[SBA_HTML_FONTSIZES] = { 0 }; - const sal_Int16 OHTMLImportExport::nCellSpacing = 0; const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 468ba9368ee5..711d567d2063 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -47,8 +47,6 @@ namespace desktop::langselect { namespace { -OUString foundLocale; - void setMsLangIdFallback(OUString const & locale) { // #i32939# setting of default document language // See #i42730# for rules for determining source of settings @@ -141,7 +139,6 @@ bool prepareLocale() { LanguageTag docTag(LANGUAGE_SYSTEM); setMsLangIdFallback(docTag.getBcp47()); - foundLocale = locale; return true; } diff --git a/include/svx/def3d.hxx b/include/svx/def3d.hxx index 5f4351d350ec..d765bb162b49 100644 --- a/include/svx/def3d.hxx +++ b/include/svx/def3d.hxx @@ -23,7 +23,6 @@ #include <o3tl/typed_flags_set.hxx> const double fPiDiv180 = 0.01745329251994; -const double EPSILON = 1e-06; #define DEG2RAD(fAngle) (fPiDiv180 * (fAngle)) diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 5b0d3f6e5f43..0451fa479d16 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -54,8 +54,6 @@ class SVXCORE_DLLPUBLIC XOutBitmap { public: - static GraphicFilter* pGrfFilter; - static Graphic MirrorGraphic( const Graphic& rGraphic, const BmpMirrorFlags nMirrorFlags ); static Animation MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr ); static ErrCode WriteGraphic( const Graphic& rGraphic, OUString& rFileName, diff --git a/lotuswordpro/inc/lwptools.hxx b/lotuswordpro/inc/lwptools.hxx index 7a360cdda9ea..3ac63055b740 100644 --- a/lotuswordpro/inc/lwptools.hxx +++ b/lotuswordpro/inc/lwptools.hxx @@ -73,7 +73,6 @@ // 01/19/2005 const sal_uInt32 UNITS_PER_INCH = 65536L * 72L; const double CM_PER_INCH = 2.54; -const double INCHT_PER_CM = 1.0 / CM_PER_INCH; //end const double POINTS_PER_INCH = 72.27; diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 580c9aa8eb56..118b5a1a8bc5 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -511,7 +511,6 @@ class ScGlobal static OUString aStrClipDocName; static std::unique_ptr<SvxBrushItem> xEmptyBrushItem; static std::unique_ptr<SvxBrushItem> xButtonBrushItem; - static std::unique_ptr<SvxBrushItem> xEmbeddedBrushItem; static std::unique_ptr<ScFunctionList> xStarCalcFunctionList; static std::unique_ptr<ScFunctionMgr> xStarCalcFunctionMgr; diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 0c044fc4aeb5..4c389e2dc611 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -91,7 +91,6 @@ OUString ScGlobal::aStrClipDocName; std::unique_ptr<SvxBrushItem> ScGlobal::xEmptyBrushItem; std::unique_ptr<SvxBrushItem> ScGlobal::xButtonBrushItem; -std::unique_ptr<SvxBrushItem> ScGlobal::xEmbeddedBrushItem; std::unique_ptr<ScFunctionList> ScGlobal::xStarCalcFunctionList; std::unique_ptr<ScFunctionMgr> ScGlobal::xStarCalcFunctionMgr; @@ -442,7 +441,6 @@ void ScGlobal::Init() xEmptyBrushItem = std::make_unique<SvxBrushItem>( COL_TRANSPARENT, ATTR_BACKGROUND ); xButtonBrushItem = std::make_unique<SvxBrushItem>( Color(), ATTR_BACKGROUND ); - xEmbeddedBrushItem = std::make_unique<SvxBrushItem>( COL_LIGHTCYAN, ATTR_BACKGROUND ); InitPPT(); //ScCompiler::InitSymbolsNative(); @@ -539,7 +537,6 @@ void ScGlobal::Clear() xEmptyBrushItem.reset(); xButtonBrushItem.reset(); - xEmbeddedBrushItem.reset(); xEnglishFormatter.reset(); delete pCaseTransliteration.load(); pCaseTransliteration = nullptr; delete pTransliteration.load(); pTransliteration = nullptr; diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index 782e86b89f9e..bc036f274821 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -40,28 +40,6 @@ std::string Round = " return fValue;\n" "}\n"; -std::string GetPMTDecl = -"double GetPMT( double fRate, double fNper, double fPv, double fFv, int nPayType );\n"; - -std::string GetPMT= -"double GetPMT( double fRate, double fNper, double fPv, double fFv, int nPayType )\n" -"{\n" -" double fPmt;\n" -" if( fRate == 0.0 )\n" -" fPmt = ( fPv + fFv ) / fNper;\n" -" else\n" -" {\n" -" double fTerm = pow( 1.0 + fRate, fNper );\n" -" if( nPayType > 0 )\n" -" fPmt = ( fFv * fRate / ( fTerm - 1.0 ) + fPv * fRate / ( 1.0 - 1." -"0 / fTerm ) ) / ( 1.0 + fRate );\n" -" else\n" -" fPmt = fFv * fRate / ( fTerm - 1.0 ) + fPv * fRate /( 1.0 - 1.0 " -"/ fTerm );\n" -" }\n" -" return -fPmt;\n" -"}\n"; - std::string GetPMT_newDecl = "double GetPMT_new( double fRate, double fNper, double fPv, double fFv," "int nPayType );\n"; @@ -306,22 +284,6 @@ std::string ScaDate= " }\n" "}\n"; -std::string ScaDate2Decl= -"void ScaDate2( int nNullDate, int nDate, int nBase,int *bLastDayMode,int *" -"bLastDay,int *b30Days,int *bUSMode);\n"; - -std::string ScaDate2= -"void ScaDate2( int nNullDate, int nDate, int nBase,int *bLastDayMode,int *" -"bLastDay,int *b30Days,int *bUSMode)\n" -"{\n" -" int nOrigDay=0, nMonth=0, nYear=0;\n" -" DaysToDate( nNullDate + nDate, &nOrigDay, &nMonth, &nYear );\n" -" *bLastDayMode = (nBase != 5);\n" -" *bLastDay = (nOrigDay >= DaysInMonth( nMonth, nYear ));\n" -" *b30Days = (nBase == 0) || (nBase == 4);\n" -" *bUSMode = (nBase == 0);\n" -"}\n"; - std::string lcl_GetCouppcdDecl= "int lcl_GetCouppcd(int nNullDate,int nSettle,int nMat,int nFreq,int nBase);\n"; diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 9020ace75db9..e6d194dc513e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -70,8 +70,6 @@ using namespace ::com::sun::star; -const double ImportExcel::fExcToTwips = TWIPS_PER_CHAR / 256.0; - ImportTyp::ImportTyp( ScDocument* pDoc, rtl_TextEncoding eQ ) { eQuellChar = eQ; diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 3edb96dfe75a..9b38e4c5228c 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -85,8 +85,6 @@ protected: }; typedef std::unordered_map<SCCOL, LastFormula> LastFormulaMapType; - static const double fExcToTwips; // translate 1/256 chars -> Twips - RootData* pExcRoot; XclImpStream maStrm; // input stream diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index 583259ac7734..858e375d2cf8 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -30,7 +30,6 @@ const std::size_t EXC_REC_SEEK_TO_END = static_cast<std::size_t>( -1 ); const sal_uInt16 EXC_MAXRECSIZE_BIFF5 = 2080; const sal_uInt16 EXC_MAXRECSIZE_BIFF8 = 8224; -const ErrCode EXC_ENCR_ERROR_WRONG_PASS = ERRCODE_SVX_WRONGPASS; const ErrCode EXC_ENCR_ERROR_UNSUPP_CRYPT = ERRCODE_SVX_READ_FILTER_CRYPT; const sal_uInt16 EXC_ENCR_BLOCKSIZE = 1024; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 7e02078129e7..53f234fdd145 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -60,8 +60,6 @@ class ScContentTree o3tl::enumarray<ScContentId, sal_uInt16> pPosList; // for the sequence - static bool bIsInDrag; // static, if the Navigator is deleted in ExecuteDrag - ScDocShell* GetManualOrCurrent(); void InitRoot(ScContentId nType); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index a8d4a25985c6..d23215c84088 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -373,7 +373,6 @@ private: SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount ); }; -extern bool bPasteIsDrop; extern bool bPasteIsMove; #endif diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index b10cbcc7d615..6d45aed39a95 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -83,8 +83,6 @@ const OUStringLiteral aContentBmps[]= u"" RID_BMP_CONTENT_DRAWING }; -bool ScContentTree::bIsInDrag = false; - ScDocShell* ScContentTree::GetManualOrCurrent() { ScDocShell* pSh = nullptr; @@ -1232,7 +1230,6 @@ IMPL_LINK(ScContentTree, DragBeginHdl, bool&, rUnsetDragIcon, bool) bool bDisallow = true; std::unique_ptr<ScDocumentLoader> pDocLoader; - bIsInDrag = true; ScModule* pScMod = SC_MOD(); @@ -1376,8 +1373,6 @@ IMPL_LINK(ScContentTree, DragBeginHdl, bool&, rUnsetDragIcon, bool) } } - bIsInDrag = false; // static member - return bDisallow; } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 9b30f3513a80..ddf50551b635 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4477,10 +4477,8 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) if ( nFormatId != SotClipboardFormatId::NONE ) { pScMod->SetInExecuteDrop( true ); // #i28468# prevent error messages from PasteDataFormat - bPasteIsDrop = true; bDone = pViewData->GetView()->PasteDataFormat( nFormatId, rEvt.maDropEvent.Transferable, nPosX, nPosY, &aLogicPos, bIsLink ); - bPasteIsDrop = false; pScMod->SetInExecuteDrop( false ); } @@ -4548,11 +4546,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) { SotClipboardFormatId nFormatId = lcl_GetDropFormatId( xTransferable, true ); if ( nFormatId != SotClipboardFormatId::NONE ) - { - bPasteIsDrop = true; pViewData->GetView()->PasteDataFormat( nFormatId, xTransferable, nPosX, nPosY, &aLogicPos ); - bPasteIsDrop = false; - } } } } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index ef0501afc469..270dd0081641 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -74,8 +74,6 @@ using namespace com::sun::star; -bool bPasteIsDrop = false; - void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable ) { diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 4ff28a7d25f6..a6c4fbc67660 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -180,7 +180,6 @@ const OUString FrameworkHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane") const OUString FrameworkHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane"); const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImpressPane"); const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + "LeftDrawPane"); -const OUString FrameworkHelper::msSidebarPaneURL( msPaneURLPrefix + "SidebarPane"); // View URLs. @@ -201,13 +200,6 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa // Task panel URLs. const OUStringLiteral FrameworkHelper::msTaskPanelURLPrefix( u"private:resource/toolpanel/" ); -const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" ); -const OUString FrameworkHelper::msRecentMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "RecentMasterPages" ); -const OUString FrameworkHelper::msUsedMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "UsedMasterPages" ); -const OUString FrameworkHelper::msLayoutTaskPanelURL( msTaskPanelURLPrefix + "Layouts" ); -const OUString FrameworkHelper::msTableDesignPanelURL( msTaskPanelURLPrefix + "TableDesign" ); -const OUString FrameworkHelper::msCustomAnimationTaskPanelURL( msTaskPanelURLPrefix + "CustomAnimations" ); -const OUString FrameworkHelper::msSlideTransitionTaskPanelURL( msTaskPanelURLPrefix + "SlideTransitions" ); // Event URLs. const OUStringLiteral FrameworkHelper::msResourceActivationRequestEvent( u"ResourceActivationRequested" ); @@ -218,10 +210,6 @@ const OUStringLiteral FrameworkHelper::msResourceDeactivationEndEvent( u"Resourc const OUStringLiteral FrameworkHelper::msConfigurationUpdateStartEvent( u"ConfigurationUpdateStart" ); const OUStringLiteral FrameworkHelper::msConfigurationUpdateEndEvent( u"ConfigurationUpdateEnd" ); -// Service names of controllers. -const OUStringLiteral FrameworkHelper::msModuleControllerService(u"com.sun.star.drawing.framework.ModuleController"); -const OUStringLiteral FrameworkHelper::msConfigurationControllerService(u"com.sun.star.drawing.framework.ConfigurationController"); - //----- helper ---------------------------------------------------------------- namespace { diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index a144cc243166..a38b541a74c8 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -61,7 +61,6 @@ public: static const OUString msFullScreenPaneURL; static const OUString msLeftImpressPaneURL; static const OUString msLeftDrawPaneURL; - static const OUString msSidebarPaneURL; // URLs of frequently used views. static const OUStringLiteral msViewURLPrefix; @@ -80,13 +79,6 @@ public: // URLs of task panels. static const OUStringLiteral msTaskPanelURLPrefix; - static const OUString msAllMasterPagesTaskPanelURL; - static const OUString msRecentMasterPagesTaskPanelURL; - static const OUString msUsedMasterPagesTaskPanelURL; - static const OUString msLayoutTaskPanelURL; - static const OUString msTableDesignPanelURL; - static const OUString msCustomAnimationTaskPanelURL; - static const OUString msSlideTransitionTaskPanelURL; // Names of frequently used events. static const OUStringLiteral msResourceActivationRequestEvent; @@ -97,10 +89,6 @@ public: static const OUStringLiteral msConfigurationUpdateStartEvent; static const OUStringLiteral msConfigurationUpdateEndEvent; - // Service names of the common controllers. - static const OUStringLiteral msModuleControllerService; - static const OUStringLiteral msConfigurationControllerService; - /** Return the FrameworkHelper object that is associated with the given ViewShellBase. If such an object does not yet exist, a new one is created. diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx index b56f46784d30..6fa44746e00d 100644 --- a/sd/source/ui/inc/unokywds.hxx +++ b/sd/source/ui/inc/unokywds.hxx @@ -23,20 +23,7 @@ #include <sal/config.h> // SdUnoPseudoStyleFamily -inline const char sUNO_PseudoSheet_Title[] = "title"; -inline const char sUNO_PseudoSheet_SubTitle[] = "subtitle"; inline const char sUNO_PseudoSheet_Background[] = "background"; -inline const char sUNO_PseudoSheet_Background_Objects[] = "backgroundobjects"; -inline const char sUNO_PseudoSheet_Notes[] = "notes"; -inline const char sUNO_PseudoSheet_Outline1[] = "outline1"; -inline const char sUNO_PseudoSheet_Outline2[] = "outline2"; -inline const char sUNO_PseudoSheet_Outline3[] = "outline3"; -inline const char sUNO_PseudoSheet_Outline4[] = "outline4"; -inline const char sUNO_PseudoSheet_Outline5[] = "outline5"; -inline const char sUNO_PseudoSheet_Outline6[] = "outline6"; -inline const char sUNO_PseudoSheet_Outline7[] = "outline7"; -inline const char sUNO_PseudoSheet_Outline8[] = "outline8"; -inline const char sUNO_PseudoSheet_Outline9[] = "outline9"; // SdLayer inline const char sUNO_LayerName_background[] = "background"; @@ -45,37 +32,18 @@ inline const char sUNO_LayerName_layout[] = "layout"; inline const char sUNO_LayerName_controls[] = "controls"; inline const char sUNO_LayerName_measurelines[] = "measurelines"; -// SdXShape -inline const char sUNO_shape_style[] = "Style"; -inline const char sUNO_shape_layername[] = "LayerName"; -inline const char sUNO_shape_zorder[] = "ZOrder"; - // services -inline const char sUNO_Service_StyleFamily[] = "com.sun.star.style.StyleFamily"; -inline const char sUNO_Service_StyleFamilies[] = "com.sun.star.style.StyleFamilies"; -inline const char sUNO_Service_Style[] = "com.sun.star.style.Style"; inline const char sUNO_Service_FillProperties[] = "com.sun.star.drawing.FillProperties"; -inline const char sUNO_Service_LineProperties[] = "com.sun.star.drawing.LineProperties"; -inline const char sUNO_Service_ParagraphProperties[] = "com.sun.star.style.ParagraphProperties"; -inline const char sUNO_Service_CharacterProperties[] = "com.sun.star.style.CharacterProperties"; -inline const char sUNO_Service_Text[] = "com.sun.star.drawing.Text"; -inline const char sUNO_Service_TextProperties[] = "com.sun.star.drawing.TextProperties"; -inline const char sUNO_Service_ShadowProperties[] = "com.sun.star.drawing.ShadowProperties"; -inline const char sUNO_Service_ConnectorProperties[] = "com.sun.star.drawing.ConnectorProperties"; -inline const char sUNO_Service_MeasureProperties[] = "com.sun.star.drawing.MeasureProperties"; inline const char sUNO_Service_PageBackground[] = "com.sun.star.drawing.PageBackground"; -inline const char sUNO_Service_GraphicObjectShape[] = "com.sun.star.drawing.GraphicObjectShape"; inline const char sUNO_Service_ImageMapRectangleObject[] = "com.sun.star.image.ImageMapRectangleObject"; inline const char sUNO_Service_ImageMapCircleObject[] = "com.sun.star.image.ImageMapCircleObject"; inline const char sUNO_Service_ImageMapPolygonObject[] = "com.sun.star.image.ImageMapPolygonObject"; // properties -inline const char sUNO_Prop_Background[] = "Background"; inline const char16_t sUNO_Prop_ForbiddenCharacters[] = u"ForbiddenCharacters"; inline const char16_t sUNO_Prop_MapUnit[] = u"MapUnit"; inline const char16_t sUNO_Prop_VisibleArea[] = u"VisibleArea"; -inline const char sUNO_Prop_Aspect[] = "Aspect"; inline const char16_t sUNO_Prop_TabStop[] = u"TabStop"; inline const char16_t sUNO_Prop_CharLocale[] = u"CharLocale"; inline const char16_t sUNO_Prop_AutomContFocus[] = u"AutomaticControlFocus"; @@ -97,21 +65,13 @@ inline const char sUNO_View_RulerIsVisible[] = "RulerIsVisible"; inline const char sUNO_View_PageKind[] = "PageKind"; inline const char sUNO_View_SelectedPage[] = "SelectedPage"; inline const char sUNO_View_IsLayerMode[] = "IsLayerMode"; -inline const char sUNO_View_IsQuickEdit[] = "IsQuickEdit"; inline const char sUNO_View_IsDoubleClickTextEdit[] = "IsDoubleClickTextEdit"; inline const char sUNO_View_IsClickChangeRotation[] = "IsClickChangeRotation"; -inline const char sUNO_View_IsDragWithCopy[] = "IsDragWithCopy"; inline const char sUNO_View_SlidesPerRow[] = "SlidesPerRow"; -inline const char sUNO_View_DrawMode[] = "DrawMode"; -inline const char sUNO_View_PreviewDrawMode[] = "PreviewDrawMode"; -inline const char sUNO_View_IsShowPreviewInPageMode[] = "IsShowPreviewInPageMode"; -inline const char sUNO_View_IsShowPreviewInMasterPageMode[] = "IsShowPreviewInMasterPageMode"; -inline const char sUNO_View_SetShowPreviewInOutlineMode[] = "SetShowPreviewInOutlineMode"; inline const char sUNO_View_EditMode[] = "EditMode"; inline const char sUNO_View_EditModeStandard[] = "EditModeStandard"; // To be deprecated // inline const char sUNO_View_EditModeNotes[] = "EditModeNotes"; // inline const char sUNO_View_EditModeHandout[] = "EditModeHandout"; -inline const char sUNO_View_VisArea[] = "VisArea"; inline const char sUNO_View_GridIsVisible[] = "GridIsVisible"; inline const char sUNO_View_GridIsFront[] = "GridIsFront"; @@ -120,17 +80,10 @@ inline const char sUNO_View_IsSnapToPageMargins[] = "IsSnapToPageMargins"; inline const char sUNO_View_IsSnapToSnapLines[] = "IsSnapToSnapLines"; inline const char sUNO_View_IsSnapToObjectFrame[] = "IsSnapToObjectFrame"; inline const char sUNO_View_IsSnapToObjectPoints[] = "IsSnapToObjectPoints"; -inline const char sUNO_View_IsSnapLinesVisible[] = "IsSnapLinesVisible"; -inline const char sUNO_View_IsDragStripes[] = "IsDragStripes"; inline const char sUNO_View_IsPlusHandlesAlwaysVisible[] = "IsPlusHandlesAlwaysVisible"; inline const char sUNO_View_IsFrameDragSingles[] = "IsFrameDragSingles"; -inline const char sUNO_View_IsMarkedHitMovesAlways[] = "IsMarkedHitMovesAlways"; inline const char sUNO_View_EliminatePolyPointLimitAngle[] = "EliminatePolyPointLimitAngle"; inline const char sUNO_View_IsEliminatePolyPoints[] = "IsEliminatePolyPoints"; -inline const char sUNO_View_IsLineDraft[] = "IsLineDraft"; -inline const char sUNO_View_IsFillDraft[] = "IsFillDraft"; -inline const char sUNO_View_IsTextDraft[] = "IsTextDraft"; -inline const char sUNO_View_IsGrafDraft[] = "IsGrafDraft"; inline const char sUNO_View_ActiveLayer[] = "ActiveLayer"; inline const char sUNO_View_NoAttribs[] = "NoAttribs"; inline const char sUNO_View_NoColors[] = "NoColors"; diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 8b8f57ea3dcc..4df88fd764a6 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -29,12 +29,9 @@ using namespace ::com::sun::star::presentation; namespace sdext::presenter { const OUStringLiteral PresenterHelper::msPaneURLPrefix( u"private:resource/pane/"); -const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane"); const OUString PresenterHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane"); const OUStringLiteral PresenterHelper::msViewURLPrefix( u"private:resource/view/"); -const OUString PresenterHelper::msPresenterScreenURL( msViewURLPrefix + "PresenterScreen"); -const OUString PresenterHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter"); Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController ( const Reference<frame::XController>& rxController) diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index 0f84bdfd3555..8ba29e20e170 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -31,12 +31,9 @@ namespace sdext::presenter { namespace PresenterHelper { extern const OUStringLiteral msPaneURLPrefix; - extern const OUString msCenterPaneURL; extern const OUString msFullScreenPaneURL; extern const OUStringLiteral msViewURLPrefix; - extern const OUString msPresenterScreenURL; - extern const OUString msSlideSorterURL; /** Return the slide show controller of a running presentation that has the same document as the given framework controller. diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index b1568431febd..14cf0ab92a69 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -43,11 +43,6 @@ const OUStringLiteral PresenterPaneFactory::msToolBarPaneURL( u"private:resource/pane/Presenter/Pane4"); const OUStringLiteral PresenterPaneFactory::msSlideSorterPaneURL( u"private:resource/pane/Presenter/Pane5"); -const OUStringLiteral PresenterPaneFactory::msHelpPaneURL( - u"private:resource/pane/Presenter/Pane6"); - -const OUStringLiteral PresenterPaneFactory::msOverlayPaneURL( - u"private:resource/pane/Presenter/Overlay"); //===== PresenterPaneFactory ================================================== diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 495aa9ad74d0..3a12481636ce 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -54,8 +54,6 @@ public: static const OUStringLiteral msNotesPaneURL; static const OUStringLiteral msToolBarPaneURL; static const OUStringLiteral msSlideSorterPaneURL; - static const OUStringLiteral msHelpPaneURL; - static const OUStringLiteral msOverlayPaneURL; /** Create a new instance of this class and register it as resource factory in the drawing framework of the given controller. diff --git a/solenv/CompilerTest_compilerplugins_clang.mk b/solenv/CompilerTest_compilerplugins_clang.mk index 453bf43af9ac..46d090781d58 100644 --- a/solenv/CompilerTest_compilerplugins_clang.mk +++ b/solenv/CompilerTest_compilerplugins_clang.mk @@ -103,6 +103,7 @@ $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \ compilerplugins/clang/test/unusedmember \ compilerplugins/clang/test/unusedvariablecheck \ compilerplugins/clang/test/unusedvariablemore \ + compilerplugins/clang/test/unusedvarsglobal \ compilerplugins/clang/test/useuniqueptr \ compilerplugins/clang/test/vclwidgets \ compilerplugins/clang/test/weakbase \ diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index d0e7db9e04b0..afcd07108e6c 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -57,9 +57,6 @@ using namespace ::utl; using namespace ::osl; using namespace ::com::sun::star::uno; -static SvtPrintOptions_Impl* pPrinterOptionsDataContainer = nullptr; -static SvtPrintOptions_Impl* pPrintFileOptionsDataContainer = nullptr; - SvtPrintOptions_Impl* SvtPrinterOptions::m_pStaticDataContainer = nullptr; sal_Int32 SvtPrinterOptions::m_nRefCount = 0; @@ -448,7 +445,6 @@ SvtPrinterOptions::SvtPrinterOptions() if( m_pStaticDataContainer == nullptr ) { m_pStaticDataContainer = new SvtPrintOptions_Impl( ROOTNODE_START "/Printer" ); - pPrinterOptionsDataContainer = m_pStaticDataContainer; svtools::ItemHolder2::holdConfigItem(EItem::PrintOptions); } @@ -467,7 +463,6 @@ SvtPrinterOptions::~SvtPrinterOptions() { delete m_pStaticDataContainer; m_pStaticDataContainer = nullptr; - pPrinterOptionsDataContainer = nullptr; } } @@ -481,8 +476,6 @@ SvtPrintFileOptions::SvtPrintFileOptions() if( m_pStaticDataContainer == nullptr ) { m_pStaticDataContainer = new SvtPrintOptions_Impl( ROOTNODE_START "/File" ); - pPrintFileOptionsDataContainer = m_pStaticDataContainer; - svtools::ItemHolder2::holdConfigItem(EItem::PrintFileOptions); } @@ -501,7 +494,6 @@ SvtPrintFileOptions::~SvtPrintFileOptions() { delete m_pStaticDataContainer; m_pStaticDataContainer = nullptr; - pPrintFileOptionsDataContainer = nullptr; } } diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 8680b6fe8189..38fc3db95a00 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -37,8 +37,6 @@ using namespace com::sun::star; -GraphicFilter* XOutBitmap::pGrfFilter = nullptr; - Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr ) { Animation aNewAnim( rAnimation ); @@ -381,11 +379,8 @@ ErrCode XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& if( pOStm ) { - pGrfFilter = &rFilter; - nRet = rFilter.ExportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), *pOStm, nFormat, pFilterData ); - pGrfFilter = nullptr; aMedium.Commit(); if( aMedium.GetError() && ( ERRCODE_NONE == nRet ) ) diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx index f8914dedb274..af8c5392a765 100644 --- a/sw/source/filter/html/css1kywd.cxx +++ b/sw/source/filter/html/css1kywd.cxx @@ -21,13 +21,9 @@ const char* const sCSS_mimetype = "text/css"; -const char* const sCSS1_import = "import"; - const char* const sCSS1_page = "page"; //const char* const sCSS1_media = "media"; -const char* const sCSS1_important = "important"; - const char* const sCSS1_link = "link"; const char* const sCSS1_visited = "visited"; const char* const sCSS1_first_letter = "first-letter"; @@ -37,7 +33,6 @@ const char* const sCSS1_right = "right"; const char* const sCSS1_first = "first"; const char* const sCSS1_url = "url"; -const char* const sCSS1_rgb = "rgb"; const char* const sCSS1_UNIT_pt = "pt"; const char* const sCSS1_UNIT_mm = "mm"; @@ -45,8 +40,6 @@ const char* const sCSS1_UNIT_cm = "cm"; const char* const sCSS1_UNIT_pc = "pc"; const char* const sCSS1_UNIT_inch = "in"; const char* const sCSS1_UNIT_px = "px"; -const char* const sCSS1_UNIT_em = "em"; -const char* const sCSS1_UNIT_ex = "ex"; // Strings for font properties @@ -78,8 +71,6 @@ const char* const sCSS1_PV_demi_light = "demi-light"; const char* const sCSS1_PV_demi_bold = "demi-bold"; const char* const sCSS1_PV_bold = "bold"; const char* const sCSS1_PV_extra_bold = "extra-bold"; -const char* const sCSS1_PV_lighter = "lighter"; -const char* const sCSS1_PV_bolder = "bolder"; const char* const sCSS1_P_text_transform = "text-transform"; @@ -89,17 +80,6 @@ const char* const sCSS1_PV_lowercase = "lowercase"; const char* const sCSS1_P_font_size = "font-size"; -const char* const sCSS1_PV_xx_small = "xx-small"; -const char* const sCSS1_PV_x_small = "x-small"; -const char* const sCSS1_PV_small = "small"; -const char* const sCSS1_PV_medium = "medium"; -const char* const sCSS1_PV_large = "large"; -const char* const sCSS1_PV_x_large = "x-large"; -const char* const sCSS1_PV_xx_large = "xx-large"; - -const char* const sCSS1_PV_larger = "larger"; -const char* const sCSS1_PV_smaller = "smaller"; - const char* const sCSS1_P_font = "font"; // Strings for color and background properties @@ -112,8 +92,6 @@ const char* const sCSS1_P_background_color = "background-color"; const char* const sCSS1_PV_transparent = "transparent"; const char* const sCSS1_PV_repeat = "repeat"; -const char* const sCSS1_PV_repeat_x = "repeat-x"; -const char* const sCSS1_PV_repeat_y = "repeat-y"; const char* const sCSS1_PV_no_repeat = "no-repeat"; const char* const sCSS1_PV_top = "top"; @@ -175,10 +153,6 @@ const char* const sCSS1_P_border_top = "border-top"; const char* const sCSS1_P_border_bottom = "border-bottom"; const char* const sCSS1_P_border = "border"; -const char* const sCSS1_PV_thin = "thin"; -//const char* const sCSS1_PV_medium = "medium"; -const char* const sCSS1_PV_thick = "thick"; - //const char* const sCSS1_PV_none = "none"; const char* const sCSS1_PV_dotted = "dotted"; const char* const sCSS1_PV_dashed = "dashed"; @@ -203,8 +177,6 @@ const char* const sCSS1_P_column_count = "column-count"; const char* const sCSS1_P_position = "position"; const char* const sCSS1_PV_absolute = "absolute"; -const char* const sCSS1_PV_relative = "relative"; -const char* const sCSS1_PV_static = "static"; const char* const sCSS1_P_left = "left"; @@ -230,8 +202,6 @@ const char* const sCSS1_PV_landscape = "landscape"; //const char* const sCSS1_PV_crop = "crop"; //const char* const sCSS1_PV_cross = "cross"; -const char* const sCSS1_class_abs_pos = "sd-abs-pos"; - const char* const sCSS1_P_so_language = "so-language"; const char* const sCSS1_P_direction = "direction"; diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx index 7c0e326fd86a..eee703adce66 100644 --- a/sw/source/filter/html/css1kywd.hxx +++ b/sw/source/filter/html/css1kywd.hxx @@ -24,12 +24,8 @@ extern const char* const sCSS_mimetype; -extern const char* const sCSS1_import; - extern const char* const sCSS1_page; -extern const char* const sCSS1_important; - extern const char* const sCSS1_link; extern const char* const sCSS1_visited; extern const char* const sCSS1_first_letter; @@ -39,7 +35,6 @@ extern const char* const sCSS1_right; extern const char* const sCSS1_first; extern const char* const sCSS1_url; -extern const char* const sCSS1_rgb; extern const char* const sCSS1_UNIT_pt; extern const char* const sCSS1_UNIT_mm; @@ -47,8 +42,6 @@ extern const char* const sCSS1_UNIT_cm; extern const char* const sCSS1_UNIT_pc; extern const char* const sCSS1_UNIT_inch; extern const char* const sCSS1_UNIT_px; -extern const char* const sCSS1_UNIT_em; -extern const char* const sCSS1_UNIT_ex; // Strings for font properties @@ -86,22 +79,9 @@ extern const char* const sCSS1_PV_demi_light; extern const char* const sCSS1_PV_demi_bold; extern const char* const sCSS1_PV_bold; extern const char* const sCSS1_PV_extra_bold; -extern const char* const sCSS1_PV_lighter; -extern const char* const sCSS1_PV_bolder; extern const char* const sCSS1_P_font_size; -extern const char* const sCSS1_PV_xx_small; -extern const char* const sCSS1_PV_x_small; -extern const char* const sCSS1_PV_small; -extern const char* const sCSS1_PV_medium; -extern const char* const sCSS1_PV_large; -extern const char* const sCSS1_PV_x_large; -extern const char* const sCSS1_PV_xx_large; - -extern const char* const sCSS1_PV_larger; -extern const char* const sCSS1_PV_smaller; - extern const char* const sCSS1_P_font; // Strings for color and background properties @@ -114,8 +94,6 @@ extern const char* const sCSS1_P_background_color; extern const char* const sCSS1_PV_transparent; extern const char* const sCSS1_PV_repeat; -extern const char* const sCSS1_PV_repeat_x; -extern const char* const sCSS1_PV_repeat_y; extern const char* const sCSS1_PV_no_repeat; extern const char* const sCSS1_PV_top; @@ -178,10 +156,6 @@ extern const char* const sCSS1_P_border_top; extern const char* const sCSS1_P_border_bottom; extern const char* const sCSS1_P_border; -extern const char* const sCSS1_PV_thin; -//extern const char* const sCSS1_PV_medium; -extern const char* const sCSS1_PV_thick; - //extern const char* const sCSS1_PV_none; extern const char* const sCSS1_PV_dotted; extern const char* const sCSS1_PV_dashed; @@ -206,8 +180,6 @@ extern const char* const sCSS1_P_column_count; extern const char* const sCSS1_P_position; extern const char* const sCSS1_PV_absolute; -extern const char* const sCSS1_PV_relative; -extern const char* const sCSS1_PV_static; extern const char* const sCSS1_P_left; @@ -234,8 +206,6 @@ extern const char* const sCSS1_PV_landscape; //extern const char* const sCSS1_PV_cross; -extern const char* const sCSS1_class_abs_pos; - extern const char* const sCSS1_P_so_language; extern const char* const sCSS1_P_direction; extern const char* const sCSS1_PV_ltr; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 2e42d33dc19b..85f080e4bebc 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -47,7 +47,6 @@ namespace SL const char aData[] = "Data"; const char aCheckBox[] = "CheckBox"; const char aListBox[] = "ListBox"; - const char aTextBox[] = "TextBox"; const char aTextField[] = "TextField"; const char aMSMacroCmds[] = "MSMacroCmds"; } diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index fd002cfd625d..00201da8303c 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -163,7 +163,6 @@ private: static GtkStyleContext *mpRadioButtonStyle; static GtkStyleContext *mpRadioButtonRadioStyle; static GtkStyleContext *mpSpinStyle; - static GtkStyleContext *mpSpinEntryStyle; static GtkStyleContext *mpSpinUpStyle; static GtkStyleContext *mpSpinDownStyle; static GtkStyleContext *mpComboboxStyle; diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index e10365de4240..7081e4275557 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -48,7 +48,6 @@ GtkStyleContext* GtkSalGraphics::mpCheckButtonCheckStyle = nullptr; GtkStyleContext* GtkSalGraphics::mpRadioButtonStyle = nullptr; GtkStyleContext* GtkSalGraphics::mpRadioButtonRadioStyle = nullptr; GtkStyleContext* GtkSalGraphics::mpSpinStyle = nullptr; -GtkStyleContext* GtkSalGraphics::mpSpinEntryStyle = nullptr; GtkStyleContext* GtkSalGraphics::mpSpinUpStyle = nullptr; GtkStyleContext* GtkSalGraphics::mpSpinDownStyle = nullptr; GtkStyleContext* GtkSalGraphics::mpComboboxStyle = nullptr; @@ -3616,7 +3615,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) gSpinBox = gtk_spin_button_new(nullptr, 0, 0); gtk_container_add(GTK_CONTAINER(gDumbContainer), gSpinBox); mpSpinStyle = createStyleContext(set_object_name, GtkControlPart::SpinButton); - mpSpinEntryStyle = createStyleContext(set_object_name, GtkControlPart::SpinButtonEntry); mpSpinUpStyle = createStyleContext(set_object_name, GtkControlPart::SpinButtonUpButton); mpSpinDownStyle = createStyleContext(set_object_name, GtkControlPart::SpinButtonDownButton); diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index 50104efc8c04..9475abaaf947 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -43,15 +43,6 @@ enum SvXMLTokenMapAttrs } -const SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] = -{ - { XML_NAMESPACE_XLINK, ::xmloff::token::XML_HREF, XML_TOK_SYMBOL_IMAGE_HREF }, - { XML_NAMESPACE_XLINK, ::xmloff::token::XML_TYPE, XML_TOK_SYMBOL_IMAGE_TYPE }, - { XML_NAMESPACE_XLINK, ::xmloff::token::XML_ACTUATE, XML_TOK_SYMBOL_IMAGE_ACTUATE }, - { XML_NAMESPACE_XLINK, ::xmloff::token::XML_SHOW, XML_TOK_SYMBOL_IMAGE_SHOW }, - XML_TOKEN_MAP_END -}; - XMLSymbolImageContext::XMLSymbolImageContext( SvXMLImport& rImport, sal_Int32 nElement, const XMLPropertyState& rProp, diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 893ab3d5df8e..0b47d5e6743f 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -37,7 +37,6 @@ extern const XMLPropertyMapEntry aXMLSDProperties[]; // entry list for presentation page properties extern const XMLPropertyMapEntry aXMLSDPresPageProps[]; -extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; // enum maps for attributes diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 3c83c23d1b89..59bcc14d2b6b 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -55,19 +55,6 @@ enum SvXMLTokenMapAttrs } -const SvXMLTokenMapEntry aDashStyleAttrTokenMap[] = -{ - { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_DASH_NAME }, - { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_DASH_DISPLAY_NAME }, - { XML_NAMESPACE_DRAW, XML_STYLE, XML_TOK_DASH_STYLE }, - { XML_NAMESPACE_DRAW, XML_DOTS1, XML_TOK_DASH_DOTS1 }, - { XML_NAMESPACE_DRAW, XML_DOTS1_LENGTH, XML_TOK_DASH_DOTS1LEN }, - { XML_NAMESPACE_DRAW, XML_DOTS2, XML_TOK_DASH_DOTS2 }, - { XML_NAMESPACE_DRAW, XML_DOTS2_LENGTH, XML_TOK_DASH_DOTS2LEN }, - { XML_NAMESPACE_DRAW, XML_DISTANCE, XML_TOK_DASH_DISTANCE }, - XML_TOKEN_MAP_END -}; - SvXMLEnumMapEntry<drawing::DashStyle> const pXML_DashStyle_Enum[] = { { XML_RECT, drawing::DashStyle_RECT }, diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 60e61df32c5f..8d546a2b7135 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -171,8 +171,6 @@ static void lcl_xmlbic_MergeVertPos( GraphicLocation& ePos, void XMLBackgroundImageContext::ProcessAttrs( const Reference< xml::sax::XFastAttributeList >& xAttrList ) { - static const SvXMLTokenMap aTokenMap( aBGImgAttributesAttrTokenMap ); - ePos = GraphicLocation_NONE; for (auto &aIter : sax_fastparser::castToFastAttributeList(xAttrList)) diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index a861996b99b6..67909f15fb96 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -59,26 +59,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; using namespace ::xmloff::token; -const SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = -{ - { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE }, - { XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_TOK_STYLE_PAGE_MASTER }, - { XML_NAMESPACE_TEXT, XML_LIST_STYLE, XML_TOK_TEXT_LIST_STYLE }, - { XML_NAMESPACE_TEXT, XML_OUTLINE_STYLE, XML_TOK_TEXT_OUTLINE }, - { XML_NAMESPACE_STYLE, XML_DEFAULT_STYLE, XML_TOK_STYLE_DEFAULT_STYLE }, - { XML_NAMESPACE_DRAW, XML_GRADIENT, XML_TOK_STYLES_GRADIENTSTYLES }, - { XML_NAMESPACE_DRAW, XML_HATCH, XML_TOK_STYLES_HATCHSTYLES }, - { XML_NAMESPACE_DRAW, XML_FILL_IMAGE, XML_TOK_STYLES_BITMAPSTYLES }, - { XML_NAMESPACE_DRAW, XML_OPACITY, XML_TOK_STYLES_TRANSGRADIENTSTYLES }, - { XML_NAMESPACE_DRAW, XML_MARKER, XML_TOK_STYLES_MARKERSTYLES }, - { XML_NAMESPACE_DRAW, XML_STROKE_DASH, XML_TOK_STYLES_DASHSTYLES }, - { XML_NAMESPACE_TEXT, XML_NOTES_CONFIGURATION, XML_TOK_TEXT_NOTE_CONFIG }, - { XML_NAMESPACE_TEXT, XML_BIBLIOGRAPHY_CONFIGURATION, XML_TOK_TEXT_BIBLIOGRAPHY_CONFIG }, - { XML_NAMESPACE_TEXT, XML_LINENUMBERING_CONFIGURATION,XML_TOK_TEXT_LINENUMBERING_CONFIG }, - { XML_NAMESPACE_STYLE, XML_DEFAULT_PAGE_LAYOUT, XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT }, - XML_TOKEN_MAP_END -}; - const OUStringLiteral gsParaStyleServiceName( u"com.sun.star.style.ParagraphStyle" ); const OUStringLiteral gsTextStyleServiceName( u"com.sun.star.style.CharacterStyle" ); diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 20b71a3fd494..a841402fed03 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -81,8 +81,6 @@ SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl( aTabStop.FillChar = ' '; sal_Unicode cTextFillChar = 0; - static const SvXMLTokenMap aTokenMap( aTabsAttributesAttrTokenMap ); - for (auto &aIter : sax_fastparser::castToFastAttributeList(xAttrList)) { const OUString sValue = aIter.toString(); diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index dc58e2cbbaa7..cf67eb8fcbc4 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -62,8 +62,6 @@ const SvXMLTokenMapEntry aDropAttrTokenMap[] = void XMLTextDropCapImportContext::ProcessAttrs( const Reference< xml::sax::XFastAttributeList >& xAttrList ) { - static const SvXMLTokenMap aTokenMap( aDropAttrTokenMap ); - DropCapFormat aFormat; bool bWholeWord = false; diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 7ccd96e06930..73e6b61d853d 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -411,20 +411,6 @@ const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = XML_TOKEN_MAP_END }; -const SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = -{ - { XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER }, - { XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER }, - { XML_NAMESPACE_STYLE, XML_HEADER_LEFT, XML_TOK_TEXT_MP_HEADER_LEFT }, - { XML_NAMESPACE_STYLE, XML_FOOTER_LEFT, XML_TOK_TEXT_MP_FOOTER_LEFT }, - { XML_NAMESPACE_LO_EXT, XML_HEADER_FIRST, XML_TOK_TEXT_MP_HEADER_FIRST }, - { XML_NAMESPACE_LO_EXT, XML_FOOTER_FIRST, XML_TOK_TEXT_MP_FOOTER_FIRST }, - { XML_NAMESPACE_STYLE, XML_HEADER_FIRST, XML_TOK_TEXT_MP_HEADER_FIRST }, - { XML_NAMESPACE_STYLE, XML_FOOTER_FIRST, XML_TOK_TEXT_MP_FOOTER_FIRST }, - - XML_TOKEN_MAP_END -}; - const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED }, |