summaryrefslogtreecommitdiff
path: root/framework/source/uielement
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-07-30 17:54:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-07-31 12:58:15 +0200
commit1c099989523fa1d969a44cc99a2478df35537a2d (patch)
tree049768012d98e84e464a16e1bb36c4bf82dd1525 /framework/source/uielement
parent421fcc61bf2d1a5dca5bd5499f713d67e1a4a0df (diff)
Improved loplugin:stringconstant (now that GCC 7 supports it): framework
Change-Id: Ia6eef000a712c9f23f81eaf6d27f5a236da9b24d Reviewed-on: https://gerrit.libreoffice.org/76673 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/source/uielement')
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx2
-rw-r--r--framework/source/uielement/objectmenucontroller.cxx2
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/recentfilesmenucontroller.cxx2
-rw-r--r--framework/source/uielement/resourcemenucontroller.cxx6
-rw-r--r--framework/source/uielement/styletoolbarcontroller.cxx12
-rw-r--r--framework/source/uielement/subtoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/thesaurusmenucontroller.cxx2
8 files changed, 17 insertions, 17 deletions
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 26154c2e8071..036aa3f24b55 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -117,7 +117,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.comp.framework.ControlMenuController");
+ return "com.sun.star.comp.framework.ControlMenuController";
}
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 772bb4ec81e9..2442171c6606 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -57,7 +57,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.comp.framework.ObjectMenuController");
+ return "com.sun.star.comp.framework.ObjectMenuController";
}
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 25037a4b9866..63a048604d76 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -303,7 +303,7 @@ GenericPopupToolbarController::GenericPopupToolbarController(
OUString GenericPopupToolbarController::getImplementationName()
{
- return OUString("com.sun.star.comp.framework.GenericPopupToolbarController");
+ return "com.sun.star.comp.framework.GenericPopupToolbarController";
}
sal_Bool GenericPopupToolbarController::supportsService(OUString const & rServiceName)
@@ -564,7 +564,7 @@ void SaveToolbarController::dispose()
OUString SaveToolbarController::getImplementationName()
{
- return OUString("com.sun.star.comp.framework.SaveToolbarController");
+ return "com.sun.star.comp.framework.SaveToolbarController";
}
sal_Bool SaveToolbarController::supportsService( OUString const & rServiceName )
@@ -608,7 +608,7 @@ NewToolbarController::NewToolbarController(
OUString NewToolbarController::getImplementationName()
{
- return OUString("org.apache.openoffice.comp.framework.NewToolbarController");
+ return "org.apache.openoffice.comp.framework.NewToolbarController";
}
sal_Bool NewToolbarController::supportsService(OUString const & rServiceName)
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 5d6581a37bef..72e3e5006e6f 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -58,7 +58,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.comp.framework.RecentFilesMenuController");
+ return "com.sun.star.comp.framework.RecentFilesMenuController";
}
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index c499cf928f8b..18195dfc0071 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -329,9 +329,9 @@ void ResourceMenuController::disposing()
OUString ResourceMenuController::getImplementationName()
{
if ( m_bToolbarContainer )
- return OUString( "com.sun.star.comp.framework.ToolbarAsMenuController" );
+ return "com.sun.star.comp.framework.ToolbarAsMenuController";
- return OUString( "com.sun.star.comp.framework.ResourceMenuController" );
+ return "com.sun.star.comp.framework.ResourceMenuController";
}
css::uno::Sequence< OUString > ResourceMenuController::getSupportedServiceNames()
@@ -380,7 +380,7 @@ void SaveAsMenuController::impl_setPopupMenu()
OUString SaveAsMenuController::getImplementationName()
{
- return OUString( "com.sun.star.comp.framework.SaveAsMenuController" );
+ return "com.sun.star.comp.framework.SaveAsMenuController";
}
}
diff --git a/framework/source/uielement/styletoolbarcontroller.cxx b/framework/source/uielement/styletoolbarcontroller.cxx
index fa9ff0593048..dfc8fa5bf007 100644
--- a/framework/source/uielement/styletoolbarcontroller.cxx
+++ b/framework/source/uielement/styletoolbarcontroller.cxx
@@ -27,17 +27,17 @@ OUString MapFamilyToCommand( const OUString& rFamily )
if ( rFamily == "ParagraphStyles" ||
rFamily == "CellStyles" || // In sc
rFamily == "graphics" ) // In sd
- return OUString( ".uno:ParaStyle" );
+ return ".uno:ParaStyle";
else if ( rFamily == "CharacterStyles" )
- return OUString( ".uno:CharStyle" );
+ return ".uno:CharStyle";
else if ( rFamily == "PageStyles" )
- return OUString( ".uno:PageStyle" );
+ return ".uno:PageStyle";
else if ( rFamily == "FrameStyles" )
- return OUString( ".uno:FrameStyle" );
+ return ".uno:FrameStyle";
else if ( rFamily == "NumberingStyles" )
- return OUString( ".uno:ListStyle" );
+ return ".uno:ListStyle";
else if ( rFamily == "TableStyles" )
- return OUString( ".uno:TableStyle" );
+ return ".uno:TableStyle";
return OUString();
}
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx
index 2eb1897b8069..058cbeee3a3c 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -419,7 +419,7 @@ void SubToolBarController::dispose()
OUString SubToolBarController::getImplementationName()
{
- return OUString( "com.sun.star.comp.framework.SubToolBarController" );
+ return "com.sun.star.comp.framework.SubToolBarController";
}
sal_Bool SubToolBarController::supportsService( const OUString& rServiceName )
diff --git a/framework/source/uielement/thesaurusmenucontroller.cxx b/framework/source/uielement/thesaurusmenucontroller.cxx
index da833b1cf1e9..bfff4cb778a0 100644
--- a/framework/source/uielement/thesaurusmenucontroller.cxx
+++ b/framework/source/uielement/thesaurusmenucontroller.cxx
@@ -150,7 +150,7 @@ OUString ThesaurusMenuController::getThesImplName( const css::lang::Locale& rLoc
OUString ThesaurusMenuController::getImplementationName()
{
- return OUString( "com.sun.star.comp.framework.ThesaurusMenuController" );
+ return "com.sun.star.comp.framework.ThesaurusMenuController";
}
css::uno::Sequence< OUString > ThesaurusMenuController::getSupportedServiceNames()