From ae662de2f1d9ed23d60aaef23fe7007f15789571 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 1 Jul 2020 08:43:10 +0200 Subject: Upcoming improved loplugin:staticanonymous -> redundantstatic: framework Change-Id: I71eaaa7cbc1c38e541291d48eb5f05157fd4c8c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97563 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- framework/source/accelerators/presethandler.cxx | 6 +- framework/source/fwe/xml/menudocumenthandler.cxx | 12 +- .../source/fwe/xml/statusbardocumenthandler.cxx | 12 +- .../source/fwe/xml/toolboxdocumenthandler.cxx | 10 +- framework/source/helper/titlebarupdate.cxx | 4 +- framework/source/layoutmanager/helpers.cxx | 2 +- framework/source/layoutmanager/layoutmanager.cxx | 2 +- .../services/ContextChangeEventMultiplexer.cxx | 2 +- framework/source/services/autorecovery.cxx | 132 ++++++++++----------- framework/source/services/substitutepathvars.cxx | 2 +- .../uiconfiguration/CommandImageResolver.cxx | 2 +- .../source/uiconfiguration/imagemanagerimpl.cxx | 8 +- .../moduleuiconfigurationmanager.cxx | 6 +- .../uiconfiguration/uiconfigurationmanager.cxx | 6 +- .../uiconfiguration/windowstateconfiguration.cxx | 34 +++--- .../source/uielement/controlmenucontroller.cxx | 2 +- framework/source/uielement/menubarmerger.cxx | 14 +-- .../source/uielement/recentfilesmenucontroller.cxx | 6 +- framework/source/uielement/statusbarmerger.cxx | 8 +- framework/source/uielement/toolbarmanager.cxx | 6 +- framework/source/uielement/toolbarmerger.cxx | 58 ++++----- .../source/uielement/toolbarsmenucontroller.cxx | 10 +- .../source/uielement/uicommanddescription.cxx | 4 +- 23 files changed, 174 insertions(+), 174 deletions(-) diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 9e95c5545960..491f48a35c96 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -36,9 +36,9 @@ #include #include -static const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1; -static const ::sal_Int32 ID_CORRUPT_UICONFIG_USER = 2; -static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; +const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1; +const ::sal_Int32 ID_CORRUPT_UICONFIG_USER = 2; +const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3; namespace framework { diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 84de0f40bd39..d6d459b01453 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -73,12 +73,12 @@ #define ATTRIBUTE_ITEMSTYLE_RADIO "radio" // Property names of a menu/menu item ItemDescriptor -static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; -static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; -static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer"; -static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; -static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; -static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; +const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; +const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; +const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer"; +const char ITEM_DESCRIPTOR_LABEL[] = "Label"; +const char ITEM_DESCRIPTOR_TYPE[] = "Type"; +const char ITEM_DESCRIPTOR_STYLE[] = "Style"; // using namespaces diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index b0e836600fdc..5dac16e429fd 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -85,12 +85,12 @@ namespace framework { // Property names of a menu/menu item ItemDescriptor -static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; -static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; -static const char ITEM_DESCRIPTOR_OFFSET[] = "Offset"; -static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; -static const char ITEM_DESCRIPTOR_WIDTH[] = "Width"; -static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; +const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; +const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL"; +const char ITEM_DESCRIPTOR_OFFSET[] = "Offset"; +const char ITEM_DESCRIPTOR_STYLE[] = "Style"; +const char ITEM_DESCRIPTOR_WIDTH[] = "Width"; +const char ITEM_DESCRIPTOR_TYPE[] = "Type"; static void ExtractStatusbarItemParameters( const Sequence< PropertyValue >& rProp, diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index ea5facd7247d..1828dc550190 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -50,11 +50,11 @@ namespace framework { // Property names of a menu/menu item ItemDescriptor -static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; -static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; -static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; -static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; -static const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible"; +const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; +const char ITEM_DESCRIPTOR_LABEL[] = "Label"; +const char ITEM_DESCRIPTOR_TYPE[] = "Type"; +const char ITEM_DESCRIPTOR_STYLE[] = "Style"; +const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible"; static void ExtractToolbarParameters( const Sequence< PropertyValue >& rProp, OUString& rCommandURL, diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index d4e5ed2df127..b7cf2d2b224a 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -38,8 +38,8 @@ namespace framework{ -static const ::sal_Int32 INVALID_ICON_ID = -1; -static const ::sal_Int32 DEFAULT_ICON_ID = 0; +const ::sal_Int32 INVALID_ICON_ID = -1; +const ::sal_Int32 DEFAULT_ICON_ID = 0; TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext) : m_xContext (xContext ) diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 22fc257a4eec..7c620b699fcd 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -137,7 +137,7 @@ void setZeroRectangle( ::tools::Rectangle& rRect ) // ATTENTION! // This value is directly copied from the sfx2 project. // You have to change BOTH values, see sfx2/inc/sfx2/sfxsids.hrc (SID_DOCKWIN_START) -static const sal_Int32 DOCKWIN_ID_BASE = 9800; +const sal_Int32 DOCKWIN_ID_BASE = 9800; bool lcl_checkUIElement(const uno::Reference< ui::XUIElement >& xUIElement, awt::Rectangle& _rPosSize, uno::Reference< awt::XWindow >& _xWindow) { diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index e11371f1f27b..2bbcb79f86db 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::ui; using namespace ::com::sun::star::frame; -static const char STATUS_BAR_ALIAS[] = "private:resource/statusbar/statusbar"; +const char STATUS_BAR_ALIAS[] = "private:resource/statusbar/statusbar"; namespace framework { diff --git a/framework/source/services/ContextChangeEventMultiplexer.cxx b/framework/source/services/ContextChangeEventMultiplexer.cxx index 417823b2c760..fe24c2b6d770 100644 --- a/framework/source/services/ContextChangeEventMultiplexer.cxx +++ b/framework/source/services/ContextChangeEventMultiplexer.cxx @@ -378,7 +378,7 @@ struct Hook ~Hook() { g_pGetMultiplexerListener = nullptr; } }; -static Hook g_hook; +Hook g_hook; } diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index b6b9dafb7f95..c7cdabb4e365 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -995,78 +995,78 @@ private: }; // recovery.xcu -static const char CFG_PACKAGE_RECOVERY[] = "org.openoffice.Office.Recovery/"; +const char CFG_PACKAGE_RECOVERY[] = "org.openoffice.Office.Recovery/"; -static const char CFG_ENTRY_AUTOSAVE_ENABLED[] = "AutoSave/Enabled"; -static const char CFG_ENTRY_AUTOSAVE_TIMEINTERVALL[] = "AutoSave/TimeIntervall"; //sic! +const char CFG_ENTRY_AUTOSAVE_ENABLED[] = "AutoSave/Enabled"; +const char CFG_ENTRY_AUTOSAVE_TIMEINTERVALL[] = "AutoSave/TimeIntervall"; //sic! -static const char CFG_ENTRY_REALDEFAULTFILTER[] = "ooSetupFactoryActualFilter"; +const char CFG_ENTRY_REALDEFAULTFILTER[] = "ooSetupFactoryActualFilter"; -static const char CFG_ENTRY_PROP_TEMPURL[] = "TempURL"; -static const char CFG_ENTRY_PROP_ORIGINALURL[] = "OriginalURL"; -static const char CFG_ENTRY_PROP_TEMPLATEURL[] = "TemplateURL"; -static const char CFG_ENTRY_PROP_FACTORYURL[] = "FactoryURL"; -static const char CFG_ENTRY_PROP_MODULE[] = "Module"; -static const char CFG_ENTRY_PROP_DOCUMENTSTATE[] = "DocumentState"; -static const char CFG_ENTRY_PROP_FILTER[] = "Filter"; -static const char CFG_ENTRY_PROP_TITLE[] = "Title"; -static const char CFG_ENTRY_PROP_ID[] = "ID"; -static const char CFG_ENTRY_PROP_VIEWNAMES[] = "ViewNames"; +const char CFG_ENTRY_PROP_TEMPURL[] = "TempURL"; +const char CFG_ENTRY_PROP_ORIGINALURL[] = "OriginalURL"; +const char CFG_ENTRY_PROP_TEMPLATEURL[] = "TemplateURL"; +const char CFG_ENTRY_PROP_FACTORYURL[] = "FactoryURL"; +const char CFG_ENTRY_PROP_MODULE[] = "Module"; +const char CFG_ENTRY_PROP_DOCUMENTSTATE[] = "DocumentState"; +const char CFG_ENTRY_PROP_FILTER[] = "Filter"; +const char CFG_ENTRY_PROP_TITLE[] = "Title"; +const char CFG_ENTRY_PROP_ID[] = "ID"; +const char CFG_ENTRY_PROP_VIEWNAMES[] = "ViewNames"; -static const char FILTER_PROP_TYPE[] = "Type"; -static const char TYPE_PROP_EXTENSIONS[] = "Extensions"; +const char FILTER_PROP_TYPE[] = "Type"; +const char TYPE_PROP_EXTENSIONS[] = "Extensions"; // setup.xcu -static const char CFG_ENTRY_PROP_EMPTYDOCUMENTURL[] = "ooSetupFactoryEmptyDocumentURL"; -static const char CFG_ENTRY_PROP_FACTORYSERVICE[] = "ooSetupFactoryDocumentService"; - -static const char EVENT_ON_NEW[] = "OnNew"; -static const char EVENT_ON_LOAD[] = "OnLoad"; -static const char EVENT_ON_UNLOAD[] = "OnUnload"; -static const char EVENT_ON_MODIFYCHANGED[] = "OnModifyChanged"; -static const char EVENT_ON_SAVE[] = "OnSave"; -static const char EVENT_ON_SAVEAS[] = "OnSaveAs"; -static const char EVENT_ON_SAVETO[] = "OnCopyTo"; -static const char EVENT_ON_SAVEDONE[] = "OnSaveDone"; -static const char EVENT_ON_SAVEASDONE[] = "OnSaveAsDone"; -static const char EVENT_ON_SAVETODONE[] = "OnCopyToDone"; -static const char EVENT_ON_SAVEFAILED[] = "OnSaveFailed"; -static const char EVENT_ON_SAVEASFAILED[] = "OnSaveAsFailed"; -static const char EVENT_ON_SAVETOFAILED[] = "OnCopyToFailed"; - -static const char RECOVERY_ITEM_BASE_IDENTIFIER[] = "recovery_item_"; - -static const char CMD_PROTOCOL[] = "vnd.sun.star.autorecovery:"; - -static const char CMD_DO_AUTO_SAVE[] = "/doAutoSave"; // force AutoSave ignoring the AutoSave timer -static const char CMD_DO_PREPARE_EMERGENCY_SAVE[] = "/doPrepareEmergencySave"; // prepare the office for the following EmergencySave step (hide windows etcpp.) -static const char CMD_DO_EMERGENCY_SAVE[] = "/doEmergencySave"; // do EmergencySave on crash -static const char CMD_DO_RECOVERY[] = "/doAutoRecovery"; // recover all crashed documents -static const char CMD_DO_ENTRY_BACKUP[] = "/doEntryBackup"; // try to store a temp or original file to a user defined location -static const char CMD_DO_ENTRY_CLEANUP[] = "/doEntryCleanUp"; // remove the specified entry from the recovery cache -static const char CMD_DO_SESSION_SAVE[] = "/doSessionSave"; // save all open documents if e.g. a window manager closes an user session -static const char CMD_DO_SESSION_QUIET_QUIT[] = "/doSessionQuietQuit"; // let the current session be quietly closed ( the saving should be done using doSessionSave previously ) if e.g. a window manager closes an user session -static const char CMD_DO_SESSION_RESTORE[] = "/doSessionRestore"; // restore a saved user session from disc -static const char CMD_DO_DISABLE_RECOVERY[] = "/disableRecovery"; // disable recovery and auto save (!) temp. for this office session -static const char CMD_DO_SET_AUTOSAVE_STATE[] = "/setAutoSaveState"; // disable/enable auto save (not crash save) for this office session - -static const char REFERRER_USER[] = "private:user"; - -static const char PROP_DISPATCH_ASYNCHRON[] = "DispatchAsynchron"; -static const char PROP_PROGRESS[] = "StatusIndicator"; -static const char PROP_SAVEPATH[] = "SavePath"; -static const char PROP_ENTRY_ID[] = "EntryID"; -static const char PROP_AUTOSAVE_STATE[] = "AutoSaveState"; - -static const char OPERATION_START[] = "start"; -static const char OPERATION_STOP[] = "stop"; -static const char OPERATION_UPDATE[] = "update"; - -static const sal_Int32 MIN_DISCSPACE_DOCSAVE = 5; // [MB] -static const sal_Int32 MIN_DISCSPACE_CONFIGSAVE = 1; // [MB] -static const sal_Int32 RETRY_STORE_ON_FULL_DISC_FOREVER = 300; // not forever ... but often enough .-) -static const sal_Int32 RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL = 3; // in case FULL DISC does not seem the real problem -static const sal_Int32 GIVE_UP_RETRY = 1; // in case FULL DISC does not seem the real problem +const char CFG_ENTRY_PROP_EMPTYDOCUMENTURL[] = "ooSetupFactoryEmptyDocumentURL"; +const char CFG_ENTRY_PROP_FACTORYSERVICE[] = "ooSetupFactoryDocumentService"; + +const char EVENT_ON_NEW[] = "OnNew"; +const char EVENT_ON_LOAD[] = "OnLoad"; +const char EVENT_ON_UNLOAD[] = "OnUnload"; +const char EVENT_ON_MODIFYCHANGED[] = "OnModifyChanged"; +const char EVENT_ON_SAVE[] = "OnSave"; +const char EVENT_ON_SAVEAS[] = "OnSaveAs"; +const char EVENT_ON_SAVETO[] = "OnCopyTo"; +const char EVENT_ON_SAVEDONE[] = "OnSaveDone"; +const char EVENT_ON_SAVEASDONE[] = "OnSaveAsDone"; +const char EVENT_ON_SAVETODONE[] = "OnCopyToDone"; +const char EVENT_ON_SAVEFAILED[] = "OnSaveFailed"; +const char EVENT_ON_SAVEASFAILED[] = "OnSaveAsFailed"; +const char EVENT_ON_SAVETOFAILED[] = "OnCopyToFailed"; + +const char RECOVERY_ITEM_BASE_IDENTIFIER[] = "recovery_item_"; + +const char CMD_PROTOCOL[] = "vnd.sun.star.autorecovery:"; + +const char CMD_DO_AUTO_SAVE[] = "/doAutoSave"; // force AutoSave ignoring the AutoSave timer +const char CMD_DO_PREPARE_EMERGENCY_SAVE[] = "/doPrepareEmergencySave"; // prepare the office for the following EmergencySave step (hide windows etcpp.) +const char CMD_DO_EMERGENCY_SAVE[] = "/doEmergencySave"; // do EmergencySave on crash +const char CMD_DO_RECOVERY[] = "/doAutoRecovery"; // recover all crashed documents +const char CMD_DO_ENTRY_BACKUP[] = "/doEntryBackup"; // try to store a temp or original file to a user defined location +const char CMD_DO_ENTRY_CLEANUP[] = "/doEntryCleanUp"; // remove the specified entry from the recovery cache +const char CMD_DO_SESSION_SAVE[] = "/doSessionSave"; // save all open documents if e.g. a window manager closes an user session +const char CMD_DO_SESSION_QUIET_QUIT[] = "/doSessionQuietQuit"; // let the current session be quietly closed ( the saving should be done using doSessionSave previously ) if e.g. a window manager closes an user session +const char CMD_DO_SESSION_RESTORE[] = "/doSessionRestore"; // restore a saved user session from disc +const char CMD_DO_DISABLE_RECOVERY[] = "/disableRecovery"; // disable recovery and auto save (!) temp. for this office session +const char CMD_DO_SET_AUTOSAVE_STATE[] = "/setAutoSaveState"; // disable/enable auto save (not crash save) for this office session + +const char REFERRER_USER[] = "private:user"; + +const char PROP_DISPATCH_ASYNCHRON[] = "DispatchAsynchron"; +const char PROP_PROGRESS[] = "StatusIndicator"; +const char PROP_SAVEPATH[] = "SavePath"; +const char PROP_ENTRY_ID[] = "EntryID"; +const char PROP_AUTOSAVE_STATE[] = "AutoSaveState"; + +const char OPERATION_START[] = "start"; +const char OPERATION_STOP[] = "stop"; +const char OPERATION_UPDATE[] = "update"; + +const sal_Int32 MIN_DISCSPACE_DOCSAVE = 5; // [MB] +const sal_Int32 MIN_DISCSPACE_CONFIGSAVE = 1; // [MB] +const sal_Int32 RETRY_STORE_ON_FULL_DISC_FOREVER = 300; // not forever ... but often enough .-) +const sal_Int32 RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL = 3; // in case FULL DISC does not seem the real problem +const sal_Int32 GIVE_UP_RETRY = 1; // in case FULL DISC does not seem the real problem #define SAVE_IN_PROGRESS true #define SAVE_FINISHED false diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index f27ff6d1d206..f5f7b71ffe61 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -82,7 +82,7 @@ struct FixedVariable }; // Table with all fixed/predefined variables supported. -static const FixedVariable aFixedVarTable[PREDEFVAR_COUNT] = +const FixedVariable aFixedVarTable[PREDEFVAR_COUNT] = { { "$(inst)", true }, // PREDEFVAR_INST { "$(prog)", true }, // PREDEFVAR_PROG diff --git a/framework/source/uiconfiguration/CommandImageResolver.cxx b/framework/source/uiconfiguration/CommandImageResolver.cxx index b443936684d9..b57d17eb1ab5 100644 --- a/framework/source/uiconfiguration/CommandImageResolver.cxx +++ b/framework/source/uiconfiguration/CommandImageResolver.cxx @@ -21,7 +21,7 @@ namespace vcl namespace { -static const o3tl::enumarray ImageType_Prefixes = +const o3tl::enumarray ImageType_Prefixes = { "cmd/sc_", "cmd/lc_", diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index be00e8bd5a6b..e17649ca8176 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -64,17 +64,17 @@ using namespace ::cppu; const sal_Int16 MAX_IMAGETYPE_VALUE = css::ui::ImageType::SIZE_32; -static const char IMAGE_FOLDER[] = "images"; -static const char BITMAPS_FOLDER[] = "Bitmaps"; +const char IMAGE_FOLDER[] = "images"; +const char BITMAPS_FOLDER[] = "Bitmaps"; -static const o3tl::enumarray IMAGELIST_XML_FILE = +const o3tl::enumarray IMAGELIST_XML_FILE = { "sc_imagelist.xml", "lc_imagelist.xml", "xc_imagelist.xml" }; -static const o3tl::enumarray BITMAP_FILE_NAMES = +const o3tl::enumarray BITMAP_FILE_NAMES = { "sc_userimages.png", "lc_userimages.png", diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 793d8ed18f4c..8062a3b27d75 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -217,7 +217,7 @@ private: // important: The order and position of the elements must match the constant // definition of "css::ui::UIElementType" -static OUStringLiteral UIELEMENTTYPENAMES[] = +OUStringLiteral UIELEMENTTYPENAMES[] = { "", // Dummy value for unknown! UIELEMENTTYPE_MENUBAR_NAME, @@ -229,8 +229,8 @@ static OUStringLiteral UIELEMENTTYPENAMES[] = UIELEMENTTYPE_TOOLPANEL_NAME }; -static const char RESOURCEURL_PREFIX[] = "private:resource/"; -static const sal_Int32 RESOURCEURL_PREFIX_SIZE = strlen(RESOURCEURL_PREFIX); +const char RESOURCEURL_PREFIX[] = "private:resource/"; +const sal_Int32 RESOURCEURL_PREFIX_SIZE = strlen(RESOURCEURL_PREFIX); sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) { diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index be337b580987..84262be81c1a 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -195,7 +195,7 @@ private: // important: The order and position of the elements must match the constant // definition of "css::ui::UIElementType" -static OUStringLiteral UIELEMENTTYPENAMES[] = +OUStringLiteral UIELEMENTTYPENAMES[] = { "", // Dummy value for unknown! UIELEMENTTYPE_MENUBAR_NAME, @@ -207,8 +207,8 @@ static OUStringLiteral UIELEMENTTYPENAMES[] = UIELEMENTTYPE_TOOLPANEL_NAME }; -static const char RESOURCEURL_PREFIX[] = "private:resource/"; -static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; +const char RESOURCEURL_PREFIX[] = "private:resource/"; +const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) { diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index f44b5cf1305b..e1efab20592a 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -60,25 +60,25 @@ using namespace framework; namespace { // Zero based indexes, order must be the same as WindowStateMask && CONFIGURATION_PROPERTIES! -static const sal_Int16 PROPERTY_LOCKED = 0; -static const sal_Int16 PROPERTY_DOCKED = 1; -static const sal_Int16 PROPERTY_VISIBLE = 2; -static const sal_Int16 PROPERTY_CONTEXT = 3; -static const sal_Int16 PROPERTY_HIDEFROMMENU = 4; -static const sal_Int16 PROPERTY_NOCLOSE = 5; -static const sal_Int16 PROPERTY_SOFTCLOSE = 6; -static const sal_Int16 PROPERTY_CONTEXTACTIVE = 7; -static const sal_Int16 PROPERTY_DOCKINGAREA = 8; -static const sal_Int16 PROPERTY_POS = 9; -static const sal_Int16 PROPERTY_SIZE = 10; -static const sal_Int16 PROPERTY_UINAME = 11; -static const sal_Int16 PROPERTY_INTERNALSTATE = 12; -static const sal_Int16 PROPERTY_STYLE = 13; -static const sal_Int16 PROPERTY_DOCKPOS = 14; -static const sal_Int16 PROPERTY_DOCKSIZE = 15; +const sal_Int16 PROPERTY_LOCKED = 0; +const sal_Int16 PROPERTY_DOCKED = 1; +const sal_Int16 PROPERTY_VISIBLE = 2; +const sal_Int16 PROPERTY_CONTEXT = 3; +const sal_Int16 PROPERTY_HIDEFROMMENU = 4; +const sal_Int16 PROPERTY_NOCLOSE = 5; +const sal_Int16 PROPERTY_SOFTCLOSE = 6; +const sal_Int16 PROPERTY_CONTEXTACTIVE = 7; +const sal_Int16 PROPERTY_DOCKINGAREA = 8; +const sal_Int16 PROPERTY_POS = 9; +const sal_Int16 PROPERTY_SIZE = 10; +const sal_Int16 PROPERTY_UINAME = 11; +const sal_Int16 PROPERTY_INTERNALSTATE = 12; +const sal_Int16 PROPERTY_STYLE = 13; +const sal_Int16 PROPERTY_DOCKPOS = 14; +const sal_Int16 PROPERTY_DOCKSIZE = 15; // Order must be the same as WindowStateMask!! -static const char* CONFIGURATION_PROPERTIES[] = +const char* CONFIGURATION_PROPERTIES[] = { WINDOWSTATE_PROPERTY_LOCKED, WINDOWSTATE_PROPERTY_DOCKED, diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 4403c89cd091..ce6a983b88cf 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -65,7 +65,7 @@ static const char* aCommands[] = ".uno:ConvertToNavigationBar" }; -static const OUStringLiteral aImgIds[] = +const OUStringLiteral aImgIds[] = { RID_SVXBMP_EDITBOX, RID_SVXBMP_BUTTON, diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index eb3b291ff66d..628f1d857ee1 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -23,15 +23,15 @@ using namespace ::com::sun::star; -static const char SEPARATOR_STRING[] = "private:separator"; +const char SEPARATOR_STRING[] = "private:separator"; -static const char MERGECOMMAND_ADDAFTER[] = "AddAfter"; -static const char MERGECOMMAND_ADDBEFORE[] = "AddBefore"; -static const char MERGECOMMAND_REPLACE[] = "Replace"; -static const char MERGECOMMAND_REMOVE[] = "Remove"; +const char MERGECOMMAND_ADDAFTER[] = "AddAfter"; +const char MERGECOMMAND_ADDBEFORE[] = "AddBefore"; +const char MERGECOMMAND_REPLACE[] = "Replace"; +const char MERGECOMMAND_REMOVE[] = "Remove"; -static const char MERGEFALLBACK_ADDPATH[] = "AddPath"; -static const char MERGEFALLBACK_IGNORE[] = "Ignore"; +const char MERGEFALLBACK_ADDPATH[] = "AddPath"; +const char MERGEFALLBACK_IGNORE[] = "Ignore"; namespace framework { diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 82fe0f361108..b775835d3a4e 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -40,9 +40,9 @@ using namespace com::sun::star::util; namespace { -static const char CMD_CLEAR_LIST[] = ".uno:ClearRecentFileList"; -static const char CMD_OPEN_AS_TEMPLATE[] = ".uno:OpenTemplate"; -static const char CMD_OPEN_REMOTE[] = ".uno:OpenRemote"; +const char CMD_CLEAR_LIST[] = ".uno:ClearRecentFileList"; +const char CMD_OPEN_AS_TEMPLATE[] = ".uno:OpenTemplate"; +const char CMD_OPEN_REMOTE[] = ".uno:OpenRemote"; class RecentFilesMenuController : public svt::PopupMenuControllerBase { diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index 900acecb8f1c..ed6948a70e1a 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -25,10 +25,10 @@ namespace framework { namespace { -static const char MERGECOMMAND_ADDAFTER[] = "AddAfter"; -static const char MERGECOMMAND_ADDBEFORE[] = "AddBefore"; -static const char MERGECOMMAND_REPLACE[] = "Replace"; -static const char MERGECOMMAND_REMOVE[] = "Remove"; +const char MERGECOMMAND_ADDAFTER[] = "AddAfter"; +const char MERGECOMMAND_ADDBEFORE[] = "AddBefore"; +const char MERGECOMMAND_REPLACE[] = "Replace"; +const char MERGECOMMAND_REMOVE[] = "Remove"; void lcl_ConvertSequenceToValues( const Sequence< PropertyValue > &rSequence, diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 07e5fd1b1a83..5aae377c4066 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -89,10 +89,10 @@ using namespace ::com::sun::star; namespace framework { -static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; -static const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible"; +const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; +const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible"; -static const sal_uInt16 STARTID_CUSTOMIZE_POPUPMENU = 1000; +const sal_uInt16 STARTID_CUSTOMIZE_POPUPMENU = 1000; static css::uno::Reference< css::frame::XLayoutManager > getLayoutManagerFromFrame( css::uno::Reference< css::frame::XFrame > const & rFrame ) diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index d6d5b4ad4dd2..b2307a9483de 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -33,35 +33,35 @@ namespace framework { -static const char MERGE_TOOLBAR_URL[] = "URL"; -static const char MERGE_TOOLBAR_TITLE[] = "Title"; -static const char MERGE_TOOLBAR_IMAGEID[] = "ImageIdentifier"; -static const char MERGE_TOOLBAR_CONTEXT[] = "Context"; -static const char MERGE_TOOLBAR_TARGET[] = "Target"; -static const char MERGE_TOOLBAR_CONTROLTYPE[] = "ControlType"; -static const char MERGE_TOOLBAR_WIDTH[] = "Width"; - -static const char MERGECOMMAND_ADDAFTER[] = "AddAfter"; -static const char MERGECOMMAND_ADDBEFORE[] = "AddBefore"; -static const char MERGECOMMAND_REPLACE[] = "Replace"; -static const char MERGECOMMAND_REMOVE[] = "Remove"; - -static const char MERGEFALLBACK_ADDLAST[] = "AddLast"; -static const char MERGEFALLBACK_ADDFIRST[] = "AddFirst"; -static const char MERGEFALLBACK_IGNORE[] = "Ignore"; - -static const char TOOLBARCONTROLLER_BUTTON[] = "Button"; -static const char TOOLBARCONTROLLER_COMBOBOX[] = "Combobox"; -static const char TOOLBARCONTROLLER_EDIT[] = "Editfield"; -static const char TOOLBARCONTROLLER_SPINFIELD[] = "Spinfield"; -static const char TOOLBARCONTROLLER_IMGBUTTON[] = "ImageButton"; -static const char TOOLBARCONTROLLER_DROPDOWNBOX[] = "Dropdownbox"; -static const char TOOLBARCONTROLLER_DROPDOWNBTN[] = "DropdownButton"; -static const char TOOLBARCONTROLLER_TOGGLEDDBTN[] = "ToggleDropdownButton"; -static const char TOOLBARCONTROLLER_FIXEDIMAGE[] = "FixedImage"; -static const char TOOLBARCONTROLLER_FIXEDTEXT[] = "FixedText"; - -static const char TOOLBOXITEM_SEPARATOR_STR[] = "private:separator"; +const char MERGE_TOOLBAR_URL[] = "URL"; +const char MERGE_TOOLBAR_TITLE[] = "Title"; +const char MERGE_TOOLBAR_IMAGEID[] = "ImageIdentifier"; +const char MERGE_TOOLBAR_CONTEXT[] = "Context"; +const char MERGE_TOOLBAR_TARGET[] = "Target"; +const char MERGE_TOOLBAR_CONTROLTYPE[] = "ControlType"; +const char MERGE_TOOLBAR_WIDTH[] = "Width"; + +const char MERGECOMMAND_ADDAFTER[] = "AddAfter"; +const char MERGECOMMAND_ADDBEFORE[] = "AddBefore"; +const char MERGECOMMAND_REPLACE[] = "Replace"; +const char MERGECOMMAND_REMOVE[] = "Remove"; + +const char MERGEFALLBACK_ADDLAST[] = "AddLast"; +const char MERGEFALLBACK_ADDFIRST[] = "AddFirst"; +const char MERGEFALLBACK_IGNORE[] = "Ignore"; + +const char TOOLBARCONTROLLER_BUTTON[] = "Button"; +const char TOOLBARCONTROLLER_COMBOBOX[] = "Combobox"; +const char TOOLBARCONTROLLER_EDIT[] = "Editfield"; +const char TOOLBARCONTROLLER_SPINFIELD[] = "Spinfield"; +const char TOOLBARCONTROLLER_IMGBUTTON[] = "ImageButton"; +const char TOOLBARCONTROLLER_DROPDOWNBOX[] = "Dropdownbox"; +const char TOOLBARCONTROLLER_DROPDOWNBTN[] = "DropdownButton"; +const char TOOLBARCONTROLLER_TOGGLEDDBTN[] = "ToggleDropdownButton"; +const char TOOLBARCONTROLLER_FIXEDIMAGE[] = "FixedImage"; +const char TOOLBARCONTROLLER_FIXEDTEXT[] = "FixedText"; + +const char TOOLBOXITEM_SEPARATOR_STR[] = "private:separator"; using namespace ::com::sun::star; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index c6c9ab409a70..19a2e25965e5 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -67,10 +67,10 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; using namespace ::com::sun::star::ui; -static const char CMD_RESTOREVISIBILITY[] = ".cmd:RestoreVisibility"; +const char CMD_RESTOREVISIBILITY[] = ".cmd:RestoreVisibility"; -static const char STATIC_CMD_PART[] = ".uno:AvailableToolbars?Toolbar:string="; -static const char STATIC_INTERNAL_CMD_PART[] = ".cmd:"; +const char STATIC_CMD_PART[] = ".uno:AvailableToolbars?Toolbar:string="; +const char STATIC_INTERNAL_CMD_PART[] = ".cmd:"; namespace framework { @@ -131,8 +131,8 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2 ( ToolbarsMenuController DEFINE_INIT_SERVICE ( ToolbarsMenuController, {} ) -static constexpr OUStringLiteral g_aPropUIName( "UIName" ); -static constexpr OUStringLiteral g_aPropResourceURL( "ResourceURL" ); +constexpr OUStringLiteral g_aPropUIName( "UIName" ); +constexpr OUStringLiteral g_aPropResourceURL( "ResourceURL" ); ToolbarsMenuController::ToolbarsMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 6c7b13a3f281..a33099ae5cb5 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -46,10 +46,10 @@ using namespace ::com::sun::star::frame; // Namespace -static const char CONFIGURATION_ROOT_ACCESS[] = "/org.openoffice.Office.UI."; +const char CONFIGURATION_ROOT_ACCESS[] = "/org.openoffice.Office.UI."; // Special resource URLs to retrieve additional information -static const char PRIVATE_RESOURCE_URL[] = "private:"; +const char PRIVATE_RESOURCE_URL[] = "private:"; const sal_Int32 COMMAND_PROPERTY_IMAGE = 1; const sal_Int32 COMMAND_PROPERTY_ROTATE = 2; -- cgit