summaryrefslogtreecommitdiff
path: root/framework/source/uielement
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/uielement')
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx2
-rw-r--r--framework/source/uielement/menubarmerger.cxx14
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx6
-rw-r--r--framework/source/uielement/statusbarmerger.cxx8
-rw-r--r--framework/source/uielement/toolbarmanager.cxx6
-rw-r--r--framework/source/uielement/toolbarmerger.cxx58
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx10
-rw-r--r--framework/source/uielement/uicommanddescription.cxx4
8 files changed, 54 insertions, 54 deletions
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;
generated by cgit (git 2.34.1) at 2025-01-26 21:53:44 +0000