summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-07-01 22:39:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-07-01 23:48:44 +0200
commit69861703cb40a27ed0427313a2ab0237140d54a8 (patch)
tree28eec82e8deca3a4756f0113b1e3409ef0e0a156 /sfx2/source/appl
parent72fcc08ea042f660dba802f20714a7fe8e86e1a8 (diff)
Upcoming improved loplugin:staticanonymous -> redundantstatic: sfx2
Change-Id: I67ac4f4ed5ddd488c3fd5bae83d1fce18d6213d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97662 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/appuno.cxx124
-rw-r--r--sfx2/source/appl/childwin.cxx2
-rw-r--r--sfx2/source/appl/shutdownicon.cxx2
-rw-r--r--sfx2/source/appl/workwin.cxx10
4 files changed, 69 insertions, 69 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 1bdb0c0e9831..7ac8358696be 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -92,68 +92,68 @@ SfxFormalArgument const aFormalArgs[] = {
{ reinterpret_cast<SfxType*>(&aSfxStringItem_Impl), "RedactionStyle", SID_REDACTION_STYLE },
};
-static sal_uInt16 const nMediaArgsCount = SAL_N_ELEMENTS(aFormalArgs);
-
-static char const sTemplateRegionName[] = "TemplateRegionName";
-static char const sTemplateName[] = "TemplateName";
-static char const sAsTemplate[] = "AsTemplate";
-static char const sOpenNewView[] = "OpenNewView";
-static char const sViewId[] = "ViewId";
-static char const sPluginMode[] = "PluginMode";
-static char const sReadOnly[] = "ReadOnly";
-static char const sDdeReconnect[] = "DDEReconnect";
-static char const sStartPresentation[] = "StartPresentation";
-static char const sFrameName[] = "FrameName";
-static char const sMediaType[] = "MediaType";
-static char const sPostData[] = "PostData";
-static char const sCharacterSet[] = "CharacterSet";
-static char const sInputStream[] = "InputStream";
-static char const sStream[] = "Stream";
-static char const sOutputStream[] = "OutputStream";
-static char const sHidden[] = "Hidden";
-static char const sPreview[] = "Preview";
-static char const sViewOnly[] = "ViewOnly";
-static char const sDontEdit[] = "DontEdit";
-static char const sSilent[] = "Silent";
-static char const sJumpMark[] = "JumpMark";
-static char const sSalvagedFile[] = "SalvagedFile";
-static char const sStatusInd[] = "StatusIndicator";
-static char const sModel[] = "Model";
-static char const sFrame[] = "Frame";
-static char const sViewData[] = "ViewData";
-static char const sFilterData[] = "FilterData";
-static char const sSelectionOnly[] = "SelectionOnly";
-static char const sMacroExecMode[] = "MacroExecutionMode";
-static char const sUpdateDocMode[] = "UpdateDocMode";
-static char const sMinimized[] = "Minimized";
-static char const sInteractionHdl[] = "InteractionHandler";
-static char const sUCBContent[] = "UCBContent";
-static char const sRepairPackage[] = "RepairPackage";
-static char const sDocumentTitle[] = "DocumentTitle";
-static char const sComponentData[] = "ComponentData";
-static char const sComponentContext[] = "ComponentContext";
-static char const sDocumentBaseURL[] = "DocumentBaseURL";
-static char const sHierarchicalDocumentName[] = "HierarchicalDocumentName";
-static char const sCopyStreamIfPossible[] = "CopyStreamIfPossible";
-static char const sNoAutoSave[] = "NoAutoSave";
-static char const sFolderName[] = "FolderName";
-static char const sUseSystemDialog[] = "UseSystemDialog";
-static char const sStandardDir[] = "StandardDir";
-static char const sBlackList[] = "BlackList";
-static char const sModifyPasswordInfo[] = "ModifyPasswordInfo";
-static char const sSuggestedSaveAsDir[] = "SuggestedSaveAsDir";
-static char const sSuggestedSaveAsName[] = "SuggestedSaveAsName";
-static char const sEncryptionData[] = "EncryptionData";
-static char const sFailOnWarning[] = "FailOnWarning";
-static char const sDocumentService[] = "DocumentService";
-static char const sFilterProvider[] = "FilterProvider";
-static char const sImageFilter[] = "ImageFilter";
-static char const sLockContentExtraction[] = "LockContentExtraction";
-static char const sLockExport[] = "LockExport";
-static char const sLockPrint[] = "LockPrint";
-static char const sLockSave[] = "LockSave";
-static char const sLockEditDoc[] = "LockEditDoc";
-static char const sReplaceable[] = "Replaceable";
+sal_uInt16 const nMediaArgsCount = SAL_N_ELEMENTS(aFormalArgs);
+
+char const sTemplateRegionName[] = "TemplateRegionName";
+char const sTemplateName[] = "TemplateName";
+char const sAsTemplate[] = "AsTemplate";
+char const sOpenNewView[] = "OpenNewView";
+char const sViewId[] = "ViewId";
+char const sPluginMode[] = "PluginMode";
+char const sReadOnly[] = "ReadOnly";
+char const sDdeReconnect[] = "DDEReconnect";
+char const sStartPresentation[] = "StartPresentation";
+char const sFrameName[] = "FrameName";
+char const sMediaType[] = "MediaType";
+char const sPostData[] = "PostData";
+char const sCharacterSet[] = "CharacterSet";
+char const sInputStream[] = "InputStream";
+char const sStream[] = "Stream";
+char const sOutputStream[] = "OutputStream";
+char const sHidden[] = "Hidden";
+char const sPreview[] = "Preview";
+char const sViewOnly[] = "ViewOnly";
+char const sDontEdit[] = "DontEdit";
+char const sSilent[] = "Silent";
+char const sJumpMark[] = "JumpMark";
+char const sSalvagedFile[] = "SalvagedFile";
+char const sStatusInd[] = "StatusIndicator";
+char const sModel[] = "Model";
+char const sFrame[] = "Frame";
+char const sViewData[] = "ViewData";
+char const sFilterData[] = "FilterData";
+char const sSelectionOnly[] = "SelectionOnly";
+char const sMacroExecMode[] = "MacroExecutionMode";
+char const sUpdateDocMode[] = "UpdateDocMode";
+char const sMinimized[] = "Minimized";
+char const sInteractionHdl[] = "InteractionHandler";
+char const sUCBContent[] = "UCBContent";
+char const sRepairPackage[] = "RepairPackage";
+char const sDocumentTitle[] = "DocumentTitle";
+char const sComponentData[] = "ComponentData";
+char const sComponentContext[] = "ComponentContext";
+char const sDocumentBaseURL[] = "DocumentBaseURL";
+char const sHierarchicalDocumentName[] = "HierarchicalDocumentName";
+char const sCopyStreamIfPossible[] = "CopyStreamIfPossible";
+char const sNoAutoSave[] = "NoAutoSave";
+char const sFolderName[] = "FolderName";
+char const sUseSystemDialog[] = "UseSystemDialog";
+char const sStandardDir[] = "StandardDir";
+char const sBlackList[] = "BlackList";
+char const sModifyPasswordInfo[] = "ModifyPasswordInfo";
+char const sSuggestedSaveAsDir[] = "SuggestedSaveAsDir";
+char const sSuggestedSaveAsName[] = "SuggestedSaveAsName";
+char const sEncryptionData[] = "EncryptionData";
+char const sFailOnWarning[] = "FailOnWarning";
+char const sDocumentService[] = "DocumentService";
+char const sFilterProvider[] = "FilterProvider";
+char const sImageFilter[] = "ImageFilter";
+char const sLockContentExtraction[] = "LockContentExtraction";
+char const sLockExport[] = "LockExport";
+char const sLockPrint[] = "LockPrint";
+char const sLockSave[] = "LockSave";
+char const sLockEditDoc[] = "LockEditDoc";
+char const sReplaceable[] = "Replaceable";
static bool isMediaDescriptor( sal_uInt16 nSlotId )
{
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 715606a114e8..4a70d0c8592f 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -39,7 +39,7 @@
#include <workwin.hxx>
#include <childwinimpl.hxx>
-static const sal_uInt16 nVersion = 2;
+const sal_uInt16 nVersion = 2;
SfxChildWinFactory::SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID,
sal_uInt16 n )
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 740cbc702a63..a23b2888b747 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -660,7 +660,7 @@ void ShutdownIcon::SetAutostart( bool bActivate )
#endif // ENABLE_QUICKSTART_APPLET
}
-static const ::sal_Int32 PROPHANDLE_TERMINATEVETOSTATE = 0;
+const ::sal_Int32 PROPHANDLE_TERMINATEVETOSTATE = 0;
// XFastPropertySet
void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32 nHandle,
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 7af0324e9b01..ce08cdf3875e 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -67,7 +67,7 @@ struct ResIdToResName
}
-static const ResIdToResName pToolBarResToName[] =
+const ResIdToResName pToolBarResToName[] =
{
{ ToolbarId::FullScreenToolbox, "fullscreenbar" },
{ ToolbarId::EnvToolbox, "standardbar", },
@@ -127,7 +127,7 @@ static const ResIdToResName pToolBarResToName[] =
// Sort the Children according their alignment
// The order corresponds to the enum SfxChildAlignment (->CHILDWIN.HXX).
-static constexpr OUStringLiteral g_aLayoutManagerPropName = "LayoutManager";
+constexpr OUStringLiteral g_aLayoutManagerPropName = "LayoutManager";
// Help to make changes to the alignment compatible!
LayoutManagerListener::LayoutManagerListener(
@@ -443,9 +443,9 @@ void SfxWorkWindow::Sort_Impl()
bSorted = true;
}
-static constexpr OUStringLiteral g_aStatusBarResName( "private:resource/statusbar/statusbar" );
-static constexpr OUStringLiteral g_aTbxTypeName( "private:resource/toolbar/" );
-static constexpr OUStringLiteral g_aProgressBarResName( "private:resource/progressbar/progressbar" );
+constexpr OUStringLiteral g_aStatusBarResName( "private:resource/statusbar/statusbar" );
+constexpr OUStringLiteral g_aTbxTypeName( "private:resource/toolbar/" );
+constexpr OUStringLiteral g_aProgressBarResName( "private:resource/progressbar/progressbar" );
// constructor for workwin of a Frame