[Libreoffice-commits] core.git: vbahelper/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 2 15:01:30 UTC 2020


 vbahelper/source/vbahelper/vbacommandbarhelper.hxx |   26 ++++++++++-----------
 vbahelper/source/vbahelper/vbaglobalbase.cxx       |    2 -
 vbahelper/source/vbahelper/vbahelper.cxx           |    8 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit f0d4f96a0c7c84ea6f81e14f9df1ca37be54db04
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 2 12:17:26 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 2 17:00:46 2020 +0200

    Upcoming improved loplugin:staticanonymous -> redundantstatic: vbahelper
    
    Change-Id: I55c29df7d500a6cd8aab01378efcbe01d1c2092f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97739
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
index 545dc7318fc0..4bd627998897 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx
@@ -27,21 +27,21 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <memory>
 
-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";
-static const char ITEM_DESCRIPTOR_ISVISIBLE[]   = "IsVisible";
-static const char ITEM_DESCRIPTOR_UINAME[]      = "UIName";
-static const char ITEM_DESCRIPTOR_ENABLED[]     = "Enabled";
+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";
+const char ITEM_DESCRIPTOR_ISVISIBLE[]   = "IsVisible";
+const char ITEM_DESCRIPTOR_UINAME[]      = "UIName";
+const char ITEM_DESCRIPTOR_ENABLED[]     = "Enabled";
 
-static const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar";
-static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
+const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar";
+const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/";
 
-static const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
-static const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
+const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_";
+const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu";
 
 class VbaCommandBarHelper;
 typedef std::shared_ptr< VbaCommandBarHelper > VbaCommandBarHelperRef;
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index 902c07d82ffb..ba7e6425106e 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -33,7 +33,7 @@ using namespace ooo::vba;
 
 // special key to return the Application
 const char sAppService[] = "ooo.vba.Application";
-static const OUStringLiteral gsApplication( "Application" );
+const OUStringLiteral gsApplication( "Application" );
 
 VbaGlobalsBase::VbaGlobalsBase(
 const uno::Reference< ov::XHelperInterface >& xParent,
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index f99701866e3d..7071a1b90b37 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -851,10 +851,10 @@ double UserFormGeometryHelper::getOffsetY() const
 }
 
 
-static const char saPosXName[] = "PositionX";
-static const char saPosYName[] = "PositionY";
-static const char saWidthName[] = "Width";
-static const char saHeightName[] = "Height";
+const char saPosXName[] = "PositionX";
+const char saPosYName[] = "PositionY";
+const char saWidthName[] = "Width";
+const char saHeightName[] = "Height";
 
 double UserFormGeometryHelper::implGetPos( bool bPosY ) const
 {


More information about the Libreoffice-commits mailing list