sfx2/qa/cppunit/test_controlleritem.cxx | 2
sfx2/source/appl/appuno.cxx | 124 ++++++++++++++--------------
sfx2/source/appl/childwin.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 2
sfx2/source/appl/workwin.cxx | 10 +-
sfx2/source/bastyp/fltfnc.cxx | 4
sfx2/source/bastyp/frmhtml.cxx | 8 -
sfx2/source/bastyp/frmhtmlw.cxx | 4
sfx2/source/bastyp/sfxhtml.cxx | 2
sfx2/source/control/recentdocsview.cxx | 4
sfx2/source/control/templatedefaultview.cxx | 4
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/filtergrouping.cxx | 2
sfx2/source/dialog/mailmodel.cxx | 2
sfx2/source/doc/DocumentMetadataAccess.cxx | 8 -
sfx2/source/doc/Metadatable.cxx | 4
sfx2/source/doc/SfxDocumentMetaData.cxx | 2
sfx2/source/doc/objxtor.cxx | 2
sfx2/source/notebookbar/SfxNotebookBar.cxx | 4
sfx2/source/sidebar/DeckLayouter.cxx | 2
sfx2/source/sidebar/DeckTitleBar.cxx | 4
sfx2/source/sidebar/PanelTitleBar.cxx | 4
sfx2/source/sidebar/SidebarController.cxx | 8 -
sfx2/source/sidebar/TitleBar.cxx | 4
sfx2/source/view/lokhelper.cxx | 4
25 files changed, 109 insertions(+), 109 deletions(-)
New commits:
commit 69861703cb40a27ed0427313a2ab0237140d54a8
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jul 1 22:39:03 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 1 23:48:44 2020 +0200
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 <sberg...@redhat.com>
diff --git a/sfx2/qa/cppunit/test_controlleritem.cxx
b/sfx2/qa/cppunit/test_controlleritem.cxx
index 9576e7b192a5..75d220536712 100644
--- a/sfx2/qa/cppunit/test_controlleritem.cxx
+++ b/sfx2/qa/cppunit/test_controlleritem.cxx
@@ -30,7 +30,7 @@ public:
private:
};
-static bool bDeleted = false;
+bool bDeleted = false;
class FooController : public SfxControllerItem {
public:
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
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 393edfc7f9cd..56d3ebf1296f 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -233,8 +233,8 @@ public:
namespace
{
- static std::vector<std::unique_ptr<SfxFilterMatcher_Impl> > aImplArr;
- static int nSfxFilterMatcherCount;
+ std::vector<std::unique_ptr<SfxFilterMatcher_Impl> > aImplArr;
+ int nSfxFilterMatcherCount;
SfxFilterMatcher_Impl & getSfxFilterMatcher_Impl(const OUString &rName)
{
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index a86a88c70320..b7cc2ea127f6 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -23,11 +23,11 @@
#include <sfx2/frmdescr.hxx>
#include <sfx2/frmhtml.hxx>
-static char const sHTML_SC_yes[] = "YES";
-static char const sHTML_SC_no[] = "NO";
-static char const sHTML_SC_auto[] = "AUTO";
+char const sHTML_SC_yes[] = "YES";
+char const sHTML_SC_no[] = "NO";
+char const sHTML_SC_auto[] = "AUTO";
-static HTMLOptionEnum<ScrollingMode> const aScrollingTable[] =
+HTMLOptionEnum<ScrollingMode> const aScrollingTable[] =
{
{ sHTML_SC_yes, ScrollingMode::Yes },
{ sHTML_SC_no, ScrollingMode::No },
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 007a9c89af55..66593b3cf2fd 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -45,8 +45,8 @@
using namespace ::com::sun::star;
-static char const sHTML_SC_yes[] = "YES";
-static char const sHTML_SC_no[] = "NO";
+char const sHTML_SC_yes[] = "YES";
+char const sHTML_SC_no[] = "NO";
void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
const char *pIndent,
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 334a62c26d09..a7c5428198a2 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star;
// <INPUT TYPE=xxx>
-static HTMLOptionEnum<sal_uInt16> const aAreaShapeOptEnums[] =
+HTMLOptionEnum<sal_uInt16> const aAreaShapeOptEnums[] =
{
{ OOO_STRING_SVTOOLS_HTML_SH_rect, IMAP_OBJ_RECTANGLE },
{ OOO_STRING_SVTOOLS_HTML_SH_rectangle, IMAP_OBJ_RECTANGLE },
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index a5aae89acb7c..abbf7e71ec1f 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -118,8 +118,8 @@ static std::map<ApplicationType,OUString>
EncryptedBitmapForExtension =
{ ApplicationType::TYPE_MATH, BMP_128X128_MATH_DOC }
};
-static constexpr long gnTextHeight = 30;
-static constexpr long gnItemPadding = 5;
+constexpr long gnTextHeight = 30;
+constexpr long gnItemPadding = 5;
RecentDocsView::RecentDocsView( vcl::Window* pParent )
: ThumbnailView(pParent)
diff --git a/sfx2/source/control/templatedefaultview.cxx
b/sfx2/source/control/templatedefaultview.cxx
index 65415520b81f..70b8f43eb85d 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -24,8 +24,8 @@
VCL_BUILDER_FACTORY(TemplateDefaultView)
-static constexpr int gnItemPadding(5); //TODO:: Change padding to 10. It looks
really crowded and occupied.
-static constexpr long gnTextHeight = 30;
+constexpr int gnItemPadding(5); //TODO:: Change padding to 10. It looks really
crowded and occupied.
+constexpr long gnTextHeight = 30;
TemplateDefaultView::TemplateDefaultView( Window* pParent)
: TemplateLocalView(pParent)
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 0287b1ac1fb8..51e179ffa811 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star;
// - Add new slot ids to sfxsids.hrc
// - Add new slots to frmslots.sdi
// - Add new slot definitions to sfx.sdi
-static const int NUM_OF_DOCKINGWINDOWS = 10;
+const int NUM_OF_DOCKINGWINDOWS = 10;
namespace {
diff --git a/sfx2/source/dialog/filtergrouping.cxx
b/sfx2/source/dialog/filtergrouping.cxx
index 85505f644266..86946325c8f9 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -398,7 +398,7 @@ namespace sfx2
}
- static const sal_Unicode s_cWildcardSeparator( ';' );
+ const sal_Unicode s_cWildcardSeparator( ';' );
static OUString getSeparatorString()
{
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index a58080b601ee..786d98e93987 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -107,7 +107,7 @@ void PrepareListener_Impl::disposing(const
css::lang::EventObject& /*rEvent*/)
// class SfxMailModel -----------------------------------------------
-static const char PDF_DOCUMENT_TYPE[] = "pdf_Portable_Document_Format";
+const char PDF_DOCUMENT_TYPE[] = "pdf_Portable_Document_Format";
SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog(
const uno::Reference< lang::XMultiServiceFactory >& xSMGR,
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx
b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 9d9ece4c82cc..12ccdcce6882 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -84,10 +84,10 @@ bool isValidNCName(OUString const & i_rIdref)
}
-static const char s_content [] = "content.xml";
-static const char s_styles [] = "styles.xml";
-static const char s_manifest[] = "manifest.rdf";
-static const char s_odfmime [] = "application/vnd.oasis.opendocument.";
+const char s_content [] = "content.xml";
+const char s_styles [] = "styles.xml";
+const char s_manifest[] = "manifest.rdf";
+const char s_odfmime [] = "application/vnd.oasis.opendocument.";
static bool isContentFile(OUString const & i_rPath)
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 22aeb427703d..b12d251924f1 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -110,8 +110,8 @@ using ::sfx2::isValidXmlId;
namespace sfx2 {
-static const char s_content [] = "content.xml";
-static const char s_styles [] = "styles.xml";
+const char s_content [] = "content.xml";
+const char s_styles [] = "styles.xml";
static bool isContentFile(OUString const & i_rPath)
{
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index c8638a52fa33..a70b826b1306 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -410,7 +410,7 @@ const char s_nsODF[] =
"urn:oasis:names:tc:opendocument:xmlns:office:1.0";
const char s_nsODFMeta[] = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0";
// const char* s_nsOOo = "http://openoffice.org/2004/office";; // not used
(yet?)
-static const char s_meta [] = "meta.xml";
+const char s_meta [] = "meta.xml";
bool isValidDate(const css::util::Date & i_rDate)
{
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index fd8fc433c3b2..94676951f0e1 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -98,7 +98,7 @@ class theCurrentComponent : public rtl::Static<
WeakReference< XInterface >, the
// remember all registered components for VBA compatibility, to be able to
remove them on disposing the model
typedef ::std::map< XInterface*, OUString > VBAConstantNameMap;
-static VBAConstantNameMap s_aRegisteredVBAConstants;
+VBAConstantNameMap s_aRegisteredVBAConstants;
OUString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent )
{
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 3a2cbae0d596..3a943c28f6fb 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -36,8 +36,8 @@ using namespace css;
#define MENUBAR_STR "private:resource/menubar/menubar"
-static const char MERGE_NOTEBOOKBAR_URL[] = "URL";
-static const char MERGE_NOTEBOOKBAR_IMAGEID[] = "ImageIdentifier";
+const char MERGE_NOTEBOOKBAR_URL[] = "URL";
+const char MERGE_NOTEBOOKBAR_IMAGEID[] = "ImageIdentifier";
bool SfxNotebookBar::m_bLock = false;
bool SfxNotebookBar::m_bHide = false;
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index 49a57bf4d8ba..0dcc3a688511 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -41,7 +41,7 @@ using namespace css::uno;
namespace sfx2::sidebar {
namespace {
- static const sal_Int32 MinimalPanelHeight (25);
+ const sal_Int32 MinimalPanelHeight (25);
enum LayoutMode
{
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx
b/sfx2/source/sidebar/DeckTitleBar.cxx
index 4c2f833a4f0a..4c2e86840e7d 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -34,8 +34,8 @@ namespace sfx2::sidebar {
namespace
{
-static const sal_Int32 gaLeftGripPadding (3);
-static const sal_Int32 gaRightGripPadding (6);
+const sal_Int32 gaLeftGripPadding (3);
+const sal_Int32 gaRightGripPadding (6);
}
DeckTitleBar::DeckTitleBar (const OUString& rsTitle,
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx
b/sfx2/source/sidebar/PanelTitleBar.cxx
index e8613f6f93d3..1369f1a03606 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -37,8 +37,8 @@ using namespace css::uno;
namespace sfx2::sidebar {
-static const sal_Int32 gaLeftIconPadding (5);
-static const sal_Int32 gaRightIconPadding (5);
+const sal_Int32 gaLeftIconPadding (5);
+const sal_Int32 gaRightIconPadding (5);
PanelTitleBar::PanelTitleBar(const OUString& rsTitle,
vcl::Window* pParentWindow,
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index c9526248f755..489d1dff034e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -67,9 +67,9 @@ using namespace css::uno;
namespace
{
- const static char gsReadOnlyCommandName[] = ".uno:EditDoc";
- const static sal_Int32 gnWidthCloseThreshold (70);
- const static sal_Int32 gnWidthOpenThreshold (40);
+ const char gsReadOnlyCommandName[] = ".uno:EditDoc";
+ const sal_Int32 gnWidthCloseThreshold (70);
+ const sal_Int32 gnWidthOpenThreshold (40);
std::string UnoNameFromDeckId(const OUString& rsDeckId, bool isImpress =
false)
{
@@ -114,7 +114,7 @@ namespace {
/** When in doubt, show this deck.
*/
- static const char gsDefaultDeckId[] = "PropertyDeck";
+ const char gsDefaultDeckId[] = "PropertyDeck";
}
SidebarController::SidebarController (
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index 40627a6c2353..436ae1433d88 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -25,8 +25,8 @@
namespace
{
- const static sal_Int32 gnLeftIconSpace (3);
- const static sal_Int32 gnRightIconSpace (3);
+ const sal_Int32 gnLeftIconSpace (3);
+ const sal_Int32 gnRightIconSpace (3);
}
namespace sfx2::sidebar {
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 80d029f1d8ca..af7b75a26897 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -67,8 +67,8 @@ int DisableCallbacks::m_nDisabled = 0;
namespace
{
-static LanguageTag g_defaultLanguageTag("en-US", true);
-static LOKDeviceFormFactor g_deviceFormFactor = LOKDeviceFormFactor::UNKNOWN;
+LanguageTag g_defaultLanguageTag("en-US", true);
+LOKDeviceFormFactor g_deviceFormFactor = LOKDeviceFormFactor::UNKNOWN;
}
int SfxLokHelper::createView()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
