scripting/source/basprov/basprov.cxx | 4 +--
scripting/source/dlgprov/dlgprov.cxx | 4 +--
scripting/source/protocolhandler/scripthandler.cxx | 2 -
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 6 ++---
scripting/source/provider/MasterScriptProvider.cxx | 8 +++---
scripting/source/provider/MasterScriptProviderFactory.cxx | 4 +--
scripting/source/provider/URIHelper.cxx | 4 +--
scripting/source/stringresource/stringresource.cxx | 8 +++---
scripting/source/vbaevents/eventhelper.cxx | 4 +--
sd/source/core/stlfamily.cxx | 2 -
sd/source/core/stlpool.cxx | 2 -
sd/source/core/stlsheet.cxx | 6 ++---
sd/source/filter/eppt/pptx-epptooxml.cxx | 2 -
sd/source/filter/html/HtmlOptionsDialog.cxx | 2 -
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 4 +--
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 -
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2 -
sd/source/ui/accessibility/AccessiblePageShape.cxx | 4 +--
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 2 -
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 2 -
sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 2 -
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 2 -
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2 -
sd/source/ui/controller/displaymodecontroller.cxx | 2 -
sd/source/ui/controller/slidelayoutcontroller.cxx | 4 +--
sd/source/ui/dlg/navigatr.cxx | 6 ++---
sd/source/ui/framework/configuration/Configuration.cxx | 4 +--
sd/source/ui/framework/configuration/ResourceId.cxx | 2 -
sd/source/ui/framework/configuration/UpdateRequest.cxx | 2 -
sd/source/ui/presenter/SlideRenderer.cxx | 2 -
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 2 -
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 -
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 4 +--
sd/source/ui/slideshow/slideshow.cxx | 2 -
sd/source/ui/uitest/uiobject.cxx | 2 -
sd/source/ui/unoidl/DrawController.cxx | 2 -
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2 -
sd/source/ui/unoidl/SdUnoOutlineView.cxx | 2 -
sd/source/ui/unoidl/SdUnoSlideView.cxx | 2 -
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2 -
sd/source/ui/unoidl/randomnode.cxx | 2 -
sd/source/ui/unoidl/sddetect.cxx | 4 +--
sd/source/ui/unoidl/unocpres.cxx | 4 +--
sd/source/ui/unoidl/unodoc.cxx | 4 +--
sd/source/ui/unoidl/unolayer.cxx | 4 +--
sd/source/ui/unoidl/unomodel.cxx | 8 +++---
sd/source/ui/unoidl/unomodule.cxx | 2 -
sd/source/ui/unoidl/unoobj.cxx | 2 -
sd/source/ui/unoidl/unopage.cxx | 6 ++---
sd/source/ui/unoidl/unopback.cxx | 2 -
sdext/source/minimizer/configurationaccess.cxx | 2 -
sdext/source/minimizer/pppoptimizerdialog.cxx | 2 -
sdext/source/pdfimport/filterdet.cxx | 2 -
sdext/source/pdfimport/inc/pdfihelper.hxx | 12
+++++-----
sdext/source/pdfimport/pdfiadaptor.cxx | 2 -
sdext/source/pdfimport/sax/saxattrlist.cxx | 2 -
sdext/source/presenter/PresenterProtocolHandler.cxx | 2 -
sdext/source/presenter/PresenterScreen.cxx | 2 -
sfx2/source/appl/appdispatchprovider.cxx | 2 -
sfx2/source/appl/appinit.cxx | 2 -
sfx2/source/appl/appserv.cxx | 12
+++++-----
sfx2/source/appl/macroloader.cxx | 2 -
sfx2/source/appl/shutdownicon.cxx | 2 -
sfx2/source/appl/xpackcreator.cxx | 2 -
sfx2/source/control/thumbnailviewacc.cxx | 4 +--
sfx2/source/dialog/backingcomp.cxx | 2 -
sfx2/source/dialog/filtergrouping.cxx | 2 -
sfx2/source/doc/SfxDocumentMetaData.cxx | 4 +--
sfx2/source/doc/doctemplates.cxx | 2 -
sfx2/source/doc/iframe.cxx | 2 -
sfx2/source/doc/objmisc.cxx | 2 -
sfx2/source/doc/ownsubfilterservice.cxx | 2 -
sfx2/source/notebookbar/SfxNotebookBar.cxx | 10
++++----
sfx2/source/notify/globalevents.cxx | 2 -
sfx2/source/sidebar/Deck.cxx | 2 -
sfx2/source/view/classificationcontroller.cxx | 2 -
sfx2/source/view/frmload.cxx | 2 -
sfx2/source/view/viewfac.cxx | 2 -
78 files changed, 125 insertions(+), 125 deletions(-)
New commits:
commit f5a219c3acbc47be3aaecd50cbdc70debaed5b03
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:49:19 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:55:24 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): scripting
Change-Id: I60519d5f0663ab244468f10cbc79a8fc80771726
Reviewed-on: https://gerrit.libreoffice.org/76651
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/scripting/source/basprov/basprov.cxx
b/scripting/source/basprov/basprov.cxx
index 1f0926abfa25..9ab855c4207a 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -70,7 +70,7 @@ namespace basprov
static OUString getImplementationName_BasicProviderImpl()
{
- return OUString( "com.sun.star.comp.scripting.ScriptProviderForBasic"
);
+ return "com.sun.star.comp.scripting.ScriptProviderForBasic";
}
@@ -399,7 +399,7 @@ namespace basprov
OUString BasicProviderImpl::getName( )
{
- return OUString("Basic");
+ return "Basic";
}
diff --git a/scripting/source/dlgprov/dlgprov.cxx
b/scripting/source/dlgprov/dlgprov.cxx
index 3c71bcf6102d..48334a44538b 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -69,7 +69,7 @@ namespace comp_DialogModelProvider
OUString _getImplementationName()
{
- return OUString("com.sun.star.comp.scripting.DialogModelProvider");
+ return "com.sun.star.comp.scripting.DialogModelProvider";
}
uno::Sequence< OUString > _getSupportedServiceNames()
@@ -160,7 +160,7 @@ namespace dlgprov
static OUString getImplementationName_DialogProviderImpl()
{
- return OUString( "com.sun.star.comp.scripting.DialogProvider" );
+ return "com.sun.star.comp.scripting.DialogProvider";
}
diff --git a/scripting/source/protocolhandler/scripthandler.cxx
b/scripting/source/protocolhandler/scripthandler.cxx
index d1a7fb9e8bb1..47216464cdb0 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -434,7 +434,7 @@ Sequence< OUString >
ScriptProtocolHandler::impl_getStaticSupportedServiceNames(
/* Helper for XServiceInfo */
OUString ScriptProtocolHandler::impl_getStaticImplementationName()
{
- return OUString("com.sun.star.comp.ScriptProtocolHandler");
+ return "com.sun.star.comp.ScriptProtocolHandler";
}
/* Helper for registry */
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index c7a7829d900f..3e3bf6b57e20 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -544,7 +544,7 @@ public:
virtual OUString SAL_CALL getName() override
{
- return OUString("Root");
+ return "Root";
}
virtual Sequence< Reference< browse::XBrowseNode > > SAL_CALL
@@ -632,8 +632,8 @@ bnf_getSupportedServiceNames( )
OUString
bnf_getImplementationName( )
{
- return OUString(
- "com.sun.star.script.browse.BrowseNodeFactory" );
+ return
+ "com.sun.star.script.browse.BrowseNodeFactory";
}
Reference< XInterface >
diff --git a/scripting/source/provider/MasterScriptProvider.cxx
b/scripting/source/provider/MasterScriptProvider.cxx
index 7b4ed3b9ab87..ca84b2599888 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -656,7 +656,7 @@ sal_Bool SAL_CALL MasterScriptProvider::hasElements( )
OUString SAL_CALL MasterScriptProvider::getImplementationName( )
{
- return OUString( "com.sun.star.script.provider.MasterScriptProvider" );
+ return "com.sun.star.script.provider.MasterScriptProvider";
}
sal_Bool SAL_CALL MasterScriptProvider::supportsService( const OUString&
serviceName )
@@ -700,7 +700,7 @@ static Sequence< OUString > sp_getSupportedServiceNames( )
static OUString sp_getImplementationName( )
{
- return OUString( "com.sun.star.script.provider.MasterScriptProvider" );
+ return "com.sun.star.script.provider.MasterScriptProvider";
}
// ***** registration or ScriptingFrameworkURIHelper
@@ -718,8 +718,8 @@ static Sequence< OUString >
urihelper_getSupportedServiceNames( )
static OUString urihelper_getImplementationName( )
{
- return OUString(
- "com.sun.star.script.provider.ScriptURIHelper");
+ return
+ "com.sun.star.script.provider.ScriptURIHelper";
}
static const struct cppu::ImplementationEntry s_entries [] =
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx
b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 5cfb70e7d7f5..3a6d74ac9598 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -72,8 +72,8 @@ Sequence< OUString > mspf_getSupportedServiceNames( )
OUString mspf_getImplementationName( )
{
- return OUString(
- "com.sun.star.script.provider.MasterScriptProviderFactory");
+ return
+ "com.sun.star.script.provider.MasterScriptProviderFactory";
}
Reference< XInterface >
diff --git a/scripting/source/provider/URIHelper.cxx
b/scripting/source/provider/URIHelper.cxx
index 650d019d1779..1d7ec0ce5bb1 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -237,8 +237,8 @@ ScriptingFrameworkURIHelper::getRootStorageURI()
OUString SAL_CALL
ScriptingFrameworkURIHelper::getImplementationName()
{
- return OUString(
- "com.sun.star.script.provider.ScriptURIHelper" );
+ return
+ "com.sun.star.script.provider.ScriptURIHelper";
}
sal_Bool SAL_CALL
diff --git a/scripting/source/stringresource/stringresource.cxx
b/scripting/source/stringresource/stringresource.cxx
index 2c4c2f8a785d..b74f76c23906 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -80,7 +80,7 @@ static Sequence< OUString >
getSupportedServiceNames_StringResourceImpl()
static OUString getImplementationName_StringResourceImpl()
{
- return OUString( "com.sun.star.comp.scripting.StringResource" );
+ return "com.sun.star.comp.scripting.StringResource";
}
static Reference< XInterface > create_StringResourceImpl(
@@ -683,7 +683,7 @@
StringResourcePersistenceImpl::~StringResourcePersistenceImpl()
OUString StringResourcePersistenceImpl::getImplementationName( )
{
- return OUString( "com.sun.star.comp.scripting.StringResource");
+ return "com.sun.star.comp.scripting.StringResource";
}
@@ -2065,7 +2065,7 @@ static Sequence< OUString >
getSupportedServiceNames_StringResourceWithStorageIm
static OUString getImplementationName_StringResourceWithStorageImpl()
{
- return OUString( "com.sun.star.comp.scripting.StringResourceWithStorage" );
+ return "com.sun.star.comp.scripting.StringResourceWithStorage";
}
static Reference< XInterface > create_StringResourceWithStorageImpl(
@@ -2351,7 +2351,7 @@ static Sequence< OUString >
getSupportedServiceNames_StringResourceWithLocationI
static OUString getImplementationName_StringResourceWithLocationImpl()
{
- return OUString( "com.sun.star.comp.scripting.StringResourceWithLocation"
);
+ return "com.sun.star.comp.scripting.StringResourceWithLocation";
}
static Reference< XInterface > create_StringResourceWithLocationImpl(
diff --git a/scripting/source/vbaevents/eventhelper.cxx
b/scripting/source/vbaevents/eventhelper.cxx
index d987c5206999..0cdf6221cc25 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -575,7 +575,7 @@ public:
OUString SAL_CALL getImplementationName() override
{
- return OUString( "ooo.vba.EventListener" );
+ return "ooo.vba.EventListener";
}
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
@@ -921,7 +921,7 @@ public:
OUString SAL_CALL getImplementationName() override
{
- return OUString( "ooo.vba.VBAToOOEventDesc" );
+ return "ooo.vba.VBAToOOEventDesc";
}
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
commit 680fb734cd7c0121cc1ba5d45e1d3f0153907fe3
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:49:12 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:55:16 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): sd
Change-Id: Ie309b2add3f615822a16e69c41c5e2e9f0ac9f7d
Reviewed-on: https://gerrit.libreoffice.org/76650
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 5e5e2ac84b37..47ef8a93af51 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -165,7 +165,7 @@ SdStyleSheet* SdStyleFamily::GetSheetByName( const
OUString& rName )
// XServiceInfo
OUString SAL_CALL SdStyleFamily::getImplementationName()
{
- return OUString( "SdStyleFamily" );
+ return "SdStyleFamily";
}
sal_Bool SAL_CALL SdStyleFamily::supportsService( const OUString& ServiceName )
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index b4f566eb4c8b..2665860a2ef2 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1218,7 +1218,7 @@ void SdStyleSheetPool::throwIfDisposed()
// XServiceInfo
OUString SAL_CALL SdStyleSheetPool::getImplementationName()
{
- return OUString( "SdStyleSheetPool" );
+ return "SdStyleSheetPool";
}
sal_Bool SAL_CALL SdStyleSheetPool::supportsService( const OUString&
ServiceName )
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 33ea114eb4f7..c6aabb05b555 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -662,12 +662,12 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily
eFamily )
switch( eFamily )
{
case SfxStyleFamily::Frame:
- return OUString( "cell" );
+ return "cell";
default:
OSL_FAIL( "SdStyleSheet::GetFamilyString(), illegal family!" );
[[fallthrough]];
case SfxStyleFamily::Para:
- return OUString( "graphics" );
+ return "graphics";
}
}
@@ -833,7 +833,7 @@ void SdStyleSheet::notifyModifyListener()
// XServiceInfo
OUString SAL_CALL SdStyleSheet::getImplementationName()
{
- return OUString( "SdStyleSheet" );
+ return "SdStyleSheet";
}
sal_Bool SAL_CALL SdStyleSheet::supportsService( const OUString& ServiceName )
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index fb0b5cb8a6bf..e738ec7eaaf1 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2001,7 +2001,7 @@ bool PowerPointExport::ImplCreateMainNotes()
OUString PowerPointExport::getImplementationName()
{
- return OUString("com.sun.star.comp.Impress.oox.PowerPointExport");
+ return "com.sun.star.comp.Impress.oox.PowerPointExport";
}
void PowerPointExport::WriteDiagram(const FSHelperPtr& pFS,
PowerPointShapeExport& rDML, const css::uno::Reference<css::drawing::XShape>&
rXShape, int nDiagramId)
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx
b/sd/source/filter/html/HtmlOptionsDialog.cxx
index e0053e566503..ec523e2c86aa 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -103,7 +103,7 @@ void SAL_CALL SdHtmlOptionsDialog::initialize( const
Sequence< Any > & )
// XServiceInfo
OUString SAL_CALL SdHtmlOptionsDialog::getImplementationName()
{
- return OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" );
+ return "com.sun.star.comp.draw.SdHtmlOptionsDialog";
}
sal_Bool SAL_CALL SdHtmlOptionsDialog::supportsService( const OUString&
rServiceName )
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 124cd984826e..1d2d1016b594 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -405,7 +405,7 @@ void SAL_CALL
OUString SAL_CALL
AccessibleDocumentViewBase::getImplementationName()
{
- return OUString("AccessibleDocumentViewBase");
+ return "AccessibleDocumentViewBase";
}
css::uno::Sequence< OUString> SAL_CALL
@@ -581,7 +581,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing()
OUString
AccessibleDocumentViewBase::CreateAccessibleName()
{
- return OUString ("AccessibleDocumentViewBase");
+ return "AccessibleDocumentViewBase";
}
void AccessibleDocumentViewBase::Activated()
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index f40561ff3eb3..b84ba0c59127 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -369,7 +369,7 @@ void SAL_CALL
OUString SAL_CALL
AccessibleDrawDocumentView::getImplementationName()
{
- return OUString("AccessibleDrawDocumentView");
+ return "AccessibleDrawDocumentView";
}
css::uno::Sequence< OUString> SAL_CALL
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 1039ec950b4d..1da0c44bc14e 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -161,7 +161,7 @@ void SAL_CALL
AccessibleOutlineView::removeAccessibleEventListener( const uno::R
OUString SAL_CALL
AccessibleOutlineView::getImplementationName()
{
- return OUString("AccessibleOutlineView");
+ return "AccessibleOutlineView";
}
//===== XEventListener ======================================================
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx
b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 05e07f4da18e..34e5e505559c 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -207,7 +207,7 @@ OUString SAL_CALL
AccessiblePageShape::getImplementationName()
{
ThrowIfDisposed ();
- return OUString("AccessiblePageShape");
+ return "AccessiblePageShape";
}
css::uno::Sequence< OUString> SAL_CALL
@@ -247,7 +247,7 @@ void AccessiblePageShape::dispose()
OUString
AccessiblePageShape::CreateAccessibleBaseName()
{
- return OUString ("PageShape");
+ return "PageShape";
}
OUString
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index 6d1a9bc2392f..73c8038bc713 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -49,7 +49,7 @@
AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape()
OUString SAL_CALL
AccessiblePresentationGraphicShape::getImplementationName()
{
- return OUString("AccessiblePresentationGraphicShape");
+ return "AccessiblePresentationGraphicShape";
}
/// Set this object's name if is different to the current name.
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index e06017c2ef5c..f956cdcca38d 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -49,7 +49,7 @@
AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape()
OUString SAL_CALL
AccessiblePresentationOLEShape::getImplementationName()
{
- return OUString("AccessiblePresentationOLEShape");
+ return "AccessiblePresentationOLEShape";
}
/// Set this object's name if it is different to the current name.
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index 7b61354af74d..3b095ccea672 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -51,7 +51,7 @@ AccessiblePresentationShape::~AccessiblePresentationShape()
OUString SAL_CALL
AccessiblePresentationShape::getImplementationName()
{
- return OUString("AccessiblePresentationShape");
+ return "AccessiblePresentationShape";
}
/// Set this object's name if is different to the current name.
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 63ab93880137..9411b429c414 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -383,7 +383,7 @@ sal_Int32 SAL_CALL
AccessibleSlideSorterObject::getBackground()
OUString SAL_CALL
AccessibleSlideSorterObject::getImplementationName()
{
- return OUString("AccessibleSlideSorterObject");
+ return "AccessibleSlideSorterObject";
}
sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const
OUString& sServiceName)
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 7a0a4fc43a63..cb024f1f849d 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -589,7 +589,7 @@ void SAL_CALL
AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi
OUString SAL_CALL
AccessibleSlideSorterView::getImplementationName()
{
- return OUString("AccessibleSlideSorterView");
+ return "AccessibleSlideSorterView";
}
sal_Bool SAL_CALL AccessibleSlideSorterView::supportsService (const OUString&
sServiceName)
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx
b/sd/source/ui/controller/displaymodecontroller.cxx
index 4bcb517189b4..161ff808773d 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -264,7 +264,7 @@ void DisplayModeController::setToolboxItemImage(const
OUString& rImage)
OUString SAL_CALL DisplayModeController::getImplementationName()
{
- return OUString( "com.sun.star.comp.sd.DisplayModeController" );
+ return "com.sun.star.comp.sd.DisplayModeController";
}
Sequence< OUString > SAL_CALL DisplayModeController::getSupportedServiceNames(
)
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx
b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 05e1dc67e5a5..21f1425a68ae 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -294,7 +294,7 @@ void LayoutToolbarMenu::SelectHdl(void const * pControl)
/// @throws css::uno::RuntimeException
static OUString SlideLayoutController_getImplementationName()
{
- return OUString( "com.sun.star.comp.sd.SlideLayoutController" );
+ return "com.sun.star.comp.sd.SlideLayoutController";
}
/// @throws RuntimeException
@@ -307,7 +307,7 @@ static Sequence< OUString >
SlideLayoutController_getSupportedServiceNames()
/// @throws css::uno::RuntimeException
static OUString InsertSlideController_getImplementationName()
{
- return OUString( "com.sun.star.comp.sd.InsertSlideController" );
+ return "com.sun.star.comp.sd.InsertSlideController";
}
/// @throws RuntimeException
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index f3170a445993..8bc734417e63 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -664,11 +664,11 @@ OUString
SdNavigatorWin::GetDragTypeSdBmpId(NavigatorDragType eDT)
case NAVIGATOR_DRAGTYPE_NONE:
return OUString();
case NAVIGATOR_DRAGTYPE_URL:
- return OUString(BMP_HYPERLINK);
+ return BMP_HYPERLINK;
case NAVIGATOR_DRAGTYPE_EMBEDDED:
- return OUString(BMP_EMBEDDED);
+ return BMP_EMBEDDED;
case NAVIGATOR_DRAGTYPE_LINK:
- return OUString(BMP_LINK);
+ return BMP_LINK;
default: OSL_FAIL( "No resource for DragType available!" );
}
return OUString();
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx
b/sd/source/ui/framework/configuration/Configuration.cxx
index 3fc947c5c92a..c4a3be614970 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -221,8 +221,8 @@ void SAL_CALL Configuration::setName (const OUString&)
OUString Configuration::getImplementationName()
{
- return OUString(
- "com.sun.star.comp.Draw.framework.configuration.Configuration");
+ return
+ "com.sun.star.comp.Draw.framework.configuration.Configuration";
}
sal_Bool Configuration::supportsService(OUString const & ServiceName)
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx
b/sd/source/ui/framework/configuration/ResourceId.cxx
index 63144754cba4..6ff8bb4f8139 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -383,7 +383,7 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>&
aArguments)
OUString ResourceId::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.framework.ResourceId");
+ return "com.sun.star.comp.Draw.framework.ResourceId";
}
sal_Bool ResourceId::supportsService(OUString const & ServiceName)
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx
b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index 1a8a0b120094..328fb3862e55 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -43,7 +43,7 @@ void SAL_CALL UpdateRequest::execute (const
Reference<XConfiguration>&)
OUString SAL_CALL UpdateRequest::getName()
{
- return OUString("UpdateRequest");
+ return "UpdateRequest";
}
void SAL_CALL UpdateRequest::setName (const OUString&)
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx
b/sd/source/ui/presenter/SlideRenderer.cxx
index 8a8d318209ed..1dc835404e38 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -62,7 +62,7 @@ void SAL_CALL SlideRenderer::initialize (const Sequence<Any>&
rArguments)
OUString SlideRenderer::getImplementationName()
{
- return OUString("com.sun.star.comp.Draw.SlideRenderer");
+ return "com.sun.star.comp.Draw.SlideRenderer";
}
sal_Bool SlideRenderer::supportsService(OUString const & ServiceName)
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index a7a8880bcbf6..93290c3b3f99 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -153,7 +153,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
OUString CurrentMasterPagesSelector::GetContextMenuUIFile() const
{
- return OUString("modules/simpress/ui/currentmastermenu.ui");
+ return "modules/simpress/ui/currentmastermenu.ui";
}
void CurrentMasterPagesSelector::UpdateSelection()
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 78c85363ca21..e4fcbf39d761 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -166,7 +166,7 @@ void MasterPagesSelector::Fill()
OUString MasterPagesSelector::GetContextMenuUIFile() const
{
- return OUString("modules/simpress/ui/mastermenu.ui");
+ return "modules/simpress/ui/mastermenu.ui";
}
IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, ValueSet*, void)
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index f20e30dd4825..65e1d58062ec 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -51,11 +51,11 @@ namespace {
OUString GetPathToImpressConfigurationRoot()
{
- return OUString("/org.openoffice.Office.Impress/");
+ return "/org.openoffice.Office.Impress/";
}
OUString GetPathToSetNode()
{
- return OUString("MultiPaneGUI/ToolPanel/RecentlyUsedMasterPages");
+ return "MultiPaneGUI/ToolPanel/RecentlyUsedMasterPages";
}
} // end of anonymous namespace
diff --git a/sd/source/ui/slideshow/slideshow.cxx
b/sd/source/ui/slideshow/slideshow.cxx
index f5c387b66404..1044e420983e 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -239,7 +239,7 @@ void SlideShow::CreateController( ViewShell* pViewSh,
::sd::View* pView, vcl::W
// XServiceInfo
OUString SAL_CALL SlideShow::getImplementationName( )
{
- return OUString( "com.sun.star.comp.sd.SlideShow" );
+ return "com.sun.star.comp.sd.SlideShow";
}
sal_Bool SAL_CALL SlideShow::supportsService( const OUString& ServiceName )
diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx
index 4919ffc91c75..1e18071092c9 100644
--- a/sd/source/ui/uitest/uiobject.cxx
+++ b/sd/source/ui/uitest/uiobject.cxx
@@ -163,7 +163,7 @@ std::set<OUString> ImpressWindowUIObject::get_children()
const
OUString ImpressWindowUIObject::get_name() const
{
- return OUString("ImpressWindowUIObject");
+ return "ImpressWindowUIObject";
}
std::unique_ptr<UIObject> ImpressWindowUIObject::create(vcl::Window* pWindow)
diff --git a/sd/source/ui/unoidl/DrawController.cxx
b/sd/source/ui/unoidl/DrawController.cxx
index 0024a1a568b3..65ee9e8cd2ce 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -204,7 +204,7 @@ OUString SAL_CALL DrawController::getImplementationName( )
// Do not throw an exception at the moment. This leads to a crash
// under Solaris on reload. See issue i70929 for details.
// ThrowIfDisposed();
- return OUString("DrawController") ;
+ return "DrawController" ;
}
static const char ssServiceName[] =
"com.sun.star.drawing.DrawingDocumentDrawView";
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx
b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 2a4f9bff7f11..f5f5ddfc56d8 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -534,7 +534,7 @@ Any SdUnoDrawView::getDrawViewMode() const
// XServiceInfo
OUString SAL_CALL SdUnoDrawView::getImplementationName( )
{
- return OUString( "com.sun.star.comp.sd.SdUnoDrawView") ;
+ return "com.sun.star.comp.sd.SdUnoDrawView" ;
}
sal_Bool SAL_CALL SdUnoDrawView::supportsService( const OUString& ServiceName )
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index c75243b5b66d..0a5da1c00806 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -140,7 +140,7 @@ Any SAL_CALL SdUnoOutlineView::getFastPropertyValue (
// XServiceInfo
OUString SAL_CALL SdUnoOutlineView::getImplementationName( )
{
- return OUString("com.sun.star.comp.sd.SdUnoOutlineView");
+ return "com.sun.star.comp.sd.SdUnoOutlineView";
}
sal_Bool SAL_CALL SdUnoOutlineView::supportsService( const OUString&
ServiceName )
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx
b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index 8df0ab9f2542..01c6d0d923e7 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -154,7 +154,7 @@ Any SAL_CALL SdUnoSlideView::getFastPropertyValue (
// XServiceInfo
OUString SAL_CALL SdUnoSlideView::getImplementationName( )
{
- return OUString( "com.sun.star.comp.sd.SdUnoSlideView" );
+ return "com.sun.star.comp.sd.SdUnoSlideView";
}
sal_Bool SAL_CALL SdUnoSlideView::supportsService( const OUString& ServiceName
)
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 53ca87c54ab1..4b86d263c5b4 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -1384,7 +1384,7 @@ void SAL_CALL
DocumentSettings::firePropertiesChangeEvent( const Sequence< OUStr
// XServiceInfo
OUString SAL_CALL DocumentSettings::getImplementationName( )
{
- return OUString( "com.sun.star.comp.Draw.DocumentSettings" );
+ return "com.sun.star.comp.Draw.DocumentSettings";
}
sal_Bool SAL_CALL DocumentSettings::supportsService( const OUString&
ServiceName )
diff --git a/sd/source/ui/unoidl/randomnode.cxx
b/sd/source/ui/unoidl/randomnode.cxx
index 8281bd812833..d86deecd9b2f 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -542,7 +542,7 @@ Reference< XAnimationNode > SAL_CALL
RandomAnimationNode::appendChild( const Ref
// XServiceInfo
OUString RandomAnimationNode::getImplementationName()
{
- return OUString( "sd::RandomAnimationNode" ) ;
+ return "sd::RandomAnimationNode" ;
}
// XServiceInfo
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 3a54d2c26071..51aeebf11439 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -104,7 +104,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence<
beans::PropertyValue >& lDes
if ( ( n8 & 0xf0 ) == 0 )
// we are supporting binary cgm format only, so
// this is a small test to exclude cgm text
- return OUString("impress_CGM_Computer_Graphics_Metafile");
+ return "impress_CGM_Computer_Graphics_Metafile";
}
}
else
@@ -137,7 +137,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence<
beans::PropertyValue >& lDes
// XServiceInfo
OUString SAL_CALL SdFilterDetect::getImplementationName()
{
- return OUString( "com.sun.star.comp.draw.FormatDetector" );
+ return "com.sun.star.comp.draw.FormatDetector";
}
// XServiceInfo
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 057b22126872..6d17695de596 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -63,7 +63,7 @@ UNO3_GETIMPLEMENTATION_IMPL( SdXCustomPresentation );
// XServiceInfo
OUString SAL_CALL SdXCustomPresentation::getImplementationName()
{
- return OUString( "SdXCustomPresentation" ) ;
+ return "SdXCustomPresentation" ;
}
sal_Bool SAL_CALL SdXCustomPresentation::supportsService( const OUString&
ServiceName )
@@ -274,7 +274,7 @@ SdXCustomPresentationAccess::~SdXCustomPresentationAccess()
throw()
// XServiceInfo
OUString SAL_CALL SdXCustomPresentationAccess::getImplementationName()
{
- return OUString( "SdXCustomPresentationAccess" );
+ return "SdXCustomPresentationAccess";
}
sal_Bool SAL_CALL SdXCustomPresentationAccess::supportsService( const
OUString& ServiceName )
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index e6e09a23d9c5..f47914246fc0 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
OUString SdDrawingDocument_getImplementationName()
{
- return OUString( "com.sun.star.comp.Draw.DrawingDocument" );
+ return "com.sun.star.comp.Draw.DrawingDocument";
}
uno::Sequence< OUString > SdDrawingDocument_getSupportedServiceNames()
@@ -61,7 +61,7 @@ uno::Reference< uno::XInterface >
SdDrawingDocument_createInstance(
OUString SdPresentationDocument_getImplementationName()
{
- return OUString( "com.sun.star.comp.Draw.PresentationDocument" );
+ return "com.sun.star.comp.Draw.PresentationDocument";
}
uno::Sequence< OUString > SdPresentationDocument_getSupportedServiceNames()
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 6c4a16f20ce4..c0749aa8cae9 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -95,7 +95,7 @@ UNO3_GETIMPLEMENTATION_IMPL( SdLayer );
// XServiceInfo
OUString SAL_CALL SdLayer::getImplementationName()
{
- return OUString("SdUnoLayer");
+ return "SdUnoLayer";
}
sal_Bool SAL_CALL SdLayer::supportsService( const OUString& ServiceName )
@@ -400,7 +400,7 @@ void SAL_CALL SdLayerManager::removeEventListener( const
uno::Reference< lang::X
// XServiceInfo
OUString SAL_CALL SdLayerManager::getImplementationName()
{
- return OUString("SdUnoLayerManager");
+ return "SdUnoLayerManager";
}
sal_Bool SAL_CALL SdLayerManager::supportsService( const OUString& ServiceName
)
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c0f3bd5b1b76..31b9ebe44b14 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1164,7 +1164,7 @@ uno::Sequence< OUString > SAL_CALL
SdXImpressDocument::getAvailableServiceNames(
// lang::XServiceInfo
OUString SAL_CALL SdXImpressDocument::getImplementationName()
{
- return OUString( "SdXImpressDocument" );
+ return "SdXImpressDocument";
/* // Matching the .component information:
return mbImpressDoc
? OUString("com.sun.star.comp.Draw.PresentationDocument")
@@ -2996,7 +2996,7 @@ void SAL_CALL SdDrawPagesAccess::remove( const
uno::Reference< drawing::XDrawPag
OUString SAL_CALL SdDrawPagesAccess::getImplementationName( )
{
- return OUString( "SdDrawPagesAccess" );
+ return "SdDrawPagesAccess";
}
sal_Bool SAL_CALL SdDrawPagesAccess::supportsService( const OUString&
ServiceName )
@@ -3253,7 +3253,7 @@ void SAL_CALL SdMasterPagesAccess::remove( const
uno::Reference< drawing::XDrawP
OUString SAL_CALL SdMasterPagesAccess::getImplementationName( )
{
- return OUString( "SdMasterPagesAccess" );
+ return "SdMasterPagesAccess";
}
sal_Bool SAL_CALL SdMasterPagesAccess::supportsService( const OUString&
ServiceName )
@@ -3431,7 +3431,7 @@ SdPage* SdDocLinkTargets::FindPage( const OUString& rName
) const
// XServiceInfo
OUString SAL_CALL SdDocLinkTargets::getImplementationName()
{
- return OUString( "SdDocLinkTargets" );
+ return "SdDocLinkTargets";
}
sal_Bool SAL_CALL SdDocLinkTargets::supportsService( const OUString&
ServiceName )
diff --git a/sd/source/ui/unoidl/unomodule.cxx
b/sd/source/ui/unoidl/unomodule.cxx
index 315d77d72309..063a5ce20552 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -107,7 +107,7 @@ uno::Reference< frame::XDispatch > SAL_CALL
SdUnoModule::queryDispatch( const ut
// XServiceInfo
OUString SAL_CALL SdUnoModule::getImplementationName( )
{
- return OUString( "com.sun.star.comp.Draw.DrawingModule" );
+ return "com.sun.star.comp.Draw.DrawingModule";
}
sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName )
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 2fd1f0fa9144..abfca37a6af2 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1622,7 +1622,7 @@ sal_Bool SAL_CALL SdUnoEventsAccess::hasElements( )
// XServiceInfo
OUString SAL_CALL SdUnoEventsAccess::getImplementationName( )
{
- return OUString( "SdUnoEventsAccess" );
+ return "SdUnoEventsAccess";
}
sal_Bool SAL_CALL SdUnoEventsAccess::supportsService( const OUString&
ServiceName )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index eaaef7cc7497..6c253908581e 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1996,7 +1996,7 @@ SdrObject* SdPageLinkTargets::FindObject( const OUString&
rName ) const throw()
// XServiceInfo
OUString SAL_CALL SdPageLinkTargets::getImplementationName()
{
- return OUString( "SdPageLinkTargets" );
+ return "SdPageLinkTargets";
}
sal_Bool SAL_CALL SdPageLinkTargets::supportsService( const OUString&
ServiceName )
@@ -2194,7 +2194,7 @@ OUString SdDrawPage::getUiNameFromPageApiName( const
OUString& rApiName )
// XServiceInfo
OUString SAL_CALL SdDrawPage::getImplementationName()
{
- return OUString( "SdDrawPage" );
+ return "SdDrawPage";
}
Sequence< OUString > SAL_CALL SdDrawPage::getSupportedServiceNames()
@@ -2714,7 +2714,7 @@ Sequence< sal_Int8 > SAL_CALL
SdMasterPage::getImplementationId()
// XServiceInfo
OUString SAL_CALL SdMasterPage::getImplementationName()
{
- return OUString( "SdMasterPage" );
+ return "SdMasterPage";
}
Sequence< OUString > SAL_CALL SdMasterPage::getSupportedServiceNames()
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 1f379ed104e8..5b5b7b429fea 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -169,7 +169,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument*
pDoc, SfxItemSet& rSet )
// XServiceInfo
OUString SAL_CALL SdUnoPageBackground::getImplementationName()
{
- return OUString("SdUnoPageBackground");
+ return "SdUnoPageBackground";
}
sal_Bool SAL_CALL SdUnoPageBackground::supportsService( const OUString&
ServiceName )
commit ec7a52125cd0674b58f58d0678e23885d67e1484
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:49:08 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:55:10 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): sdext
Change-Id: I3124c3e91c2bbf918113544d5d01b55a3f6b6005
Reviewed-on: https://gerrit.libreoffice.org/76649
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sdext/source/minimizer/configurationaccess.cxx
b/sdext/source/minimizer/configurationaccess.cxx
index bf6a472a1e68..32cad4b53a91 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::container;
static OUString GetPathToConfigurationRoot()
{
- return OUString("org.openoffice.Office.PresentationMinimizer");
+ return "org.openoffice.Office.PresentationMinimizer";
}
void OptimizerSettings::LoadSettingsFromConfiguration( const Reference<
XNameAccess >& rSettings )
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx
b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 8c0d0a28d26d..66efb3e29824 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -148,7 +148,7 @@ void SAL_CALL PPPOptimizerDialog::removeStatusListener(
const Reference< XStatus
OUString PPPOptimizerDialog_getImplementationName()
{
- return OUString( "com.sun.star.comp.PresentationMinimizerImp" );
+ return "com.sun.star.comp.PresentationMinimizerImp";
}
Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
diff --git a/sdext/source/pdfimport/filterdet.cxx
b/sdext/source/pdfimport/filterdet.cxx
index 01a1177f70e7..9ef8cccd6b9d 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -385,7 +385,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence<
beans::PropertyValue >& rF
OUString PDFDetector::getImplementationName()
{
- return OUString("org.libreoffice.comp.documents.PDFDetector");
+ return "org.libreoffice.comp.documents.PDFDetector";
}
sal_Bool PDFDetector::supportsService(OUString const & ServiceName)
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx
b/sdext/source/pdfimport/inc/pdfihelper.hxx
index 4a7fd569688e..6557ffad8612 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -154,11 +154,11 @@ namespace pdfi
{
default:
case css::rendering::PathJoinType::MITER:
- return OUString("miter");
+ return "miter";
case css::rendering::PathJoinType::ROUND:
- return OUString("round");
+ return "round";
case css::rendering::PathJoinType::BEVEL:
- return OUString("bevel");
+ return "bevel";
}
}
@@ -168,11 +168,11 @@ namespace pdfi
{
default:
case css::rendering::PathCapType::BUTT:
- return OUString("butt");
+ return "butt";
case css::rendering::PathCapType::ROUND:
- return OUString("round");
+ return "round";
case css::rendering::PathCapType::SQUARE:
- return OUString("square");
+ return "square";
}
}
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx
b/sdext/source/pdfimport/pdfiadaptor.cxx
index ee415ed31255..060795a47762 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -198,7 +198,7 @@ void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const
uno::Reference< lang::
OUString PDFIHybridAdaptor::getImplementationName()
{
- return OUString("org.libreoffice.comp.documents.HybridPDFImport");
+ return "org.libreoffice.comp.documents.HybridPDFImport";
}
sal_Bool PDFIHybridAdaptor::supportsService(OUString const & ServiceName)
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx
b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 8efb6b4c9acc..538f6f4479b5 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -36,7 +36,7 @@ SaxAttrList::SaxAttrList( const std::unordered_map< OUString,
OUString >& rMap )
namespace {
OUString getCDATAString()
{
- return OUString( "CDATA" );
+ return "CDATA";
}
}
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx
b/sdext/source/presenter/PresenterProtocolHandler.cxx
index a78b2ac32014..35b528d5ba9e 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -229,7 +229,7 @@ private:
OUString PresenterProtocolHandler::getImplementationName_static()
{
- return OUString("org.libreoffice.comp.PresenterScreenProtocolHandler");
+ return "org.libreoffice.comp.PresenterScreenProtocolHandler";
}
Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static()
diff --git a/sdext/source/presenter/PresenterScreen.cxx
b/sdext/source/presenter/PresenterScreen.cxx
index 8689934bf58d..7d7139f9161e 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -92,7 +92,7 @@ namespace {
OUString PresenterScreenJob::getImplementationName_static()
{
- return OUString("org.libreoffice.comp.PresenterScreenJob");
+ return "org.libreoffice.comp.PresenterScreenJob";
}
Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static()
commit f0531aee9535118addf73771c2b3d8a02f1894bf
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:48:58 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:55:02 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): sfx2
Change-Id: Idb86a5351feaf307504d1f1f110ef8b1275bedce
Reviewed-on: https://gerrit.libreoffice.org/76648
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sfx2/source/appl/appdispatchprovider.cxx
b/sfx2/source/appl/appdispatchprovider.cxx
index 5c197bf92eaf..ccca8d4be667 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -102,7 +102,7 @@ void SfxAppDispatchProvider::initialize(
OUString SAL_CALL SfxAppDispatchProvider::getImplementationName()
{
- return OUString( "com.sun.star.comp.sfx2.AppDispatchProvider" );
+ return "com.sun.star.comp.sfx2.AppDispatchProvider";
}
sal_Bool SAL_CALL SfxAppDispatchProvider::supportsService( const OUString&
sServiceName )
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 89e1ea98d197..b96fe74dd544 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -121,7 +121,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination(
const EventObject& a
OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName()
{
- return OUString("com.sun.star.comp.sfx2.SfxTerminateListener");
+ return "com.sun.star.comp.sfx2.SfxTerminateListener";
}
sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString&
sServiceName )
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index a6f66d604c1c..fc9c5b08fc52 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -159,22 +159,22 @@ namespace
switch ( eApp )
{
case vcl::EnumContext::Application::Writer:
- return OUString( "Writer" );
+ return "Writer";
break;
case vcl::EnumContext::Application::Calc:
- return OUString( "Calc" );
+ return "Calc";
break;
case vcl::EnumContext::Application::Impress:
- return OUString( "Impress" );
+ return "Impress";
break;
case vcl::EnumContext::Application::Draw:
- return OUString( "Draw" );
+ return "Draw";
break;
case vcl::EnumContext::Application::Formula:
- return OUString( "Formula" );
+ return "Formula";
break;
case vcl::EnumContext::Application::Base:
- return OUString( "Base" );
+ return "Base";
break;
default:
return OUString();
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index 1aeff343e275..98e036e0a7ea 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -62,7 +62,7 @@ SfxMacroLoader::SfxMacroLoader(const css::uno::Sequence<
css::uno::Any >& aArgum
OUString SAL_CALL SfxMacroLoader::getImplementationName()
{
- return OUString("com.sun.star.comp.sfx2.SfxMacroLoader");
+ return "com.sun.star.comp.sfx2.SfxMacroLoader";
}
sal_Bool SAL_CALL SfxMacroLoader::supportsService(OUString const & ServiceName)
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index 6d828ed11343..5d4e46e40caa 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -100,7 +100,7 @@ void SAL_CALL SfxNotificationListener_Impl::disposing(
const EventObject& )
OUString SAL_CALL ShutdownIcon::getImplementationName()
{
- return OUString("com.sun.star.comp.desktop.QuickstartWrapper");
+ return "com.sun.star.comp.desktop.QuickstartWrapper";
}
sal_Bool SAL_CALL ShutdownIcon::supportsService(OUString const & ServiceName)
diff --git a/sfx2/source/appl/xpackcreator.cxx
b/sfx2/source/appl/xpackcreator.cxx
index 0e0c559476bf..2434cabbef7c 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -148,7 +148,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage(
const OUString& aFolde
OUString SAL_CALL OPackageStructureCreator::getImplementationName()
{
- return OUString("com.sun.star.comp.embed.PackageStructureCreator");
+ return "com.sun.star.comp.embed.PackageStructureCreator";
}
sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const OUString&
ServiceName )
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index 2565c6614877..91b31ebc8a92 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -195,7 +195,7 @@ sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole()
OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription()
{
ThrowIfDisposed();
- return OUString("ThumbnailView");
+ return "ThumbnailView";
}
OUString SAL_CALL ThumbnailViewAcc::getAccessibleName()
@@ -652,7 +652,7 @@ sal_Int16 SAL_CALL SfxThumbnailViewAcc::getAccessibleRole()
OUString SAL_CALL SfxThumbnailViewAcc::getAccessibleDescription()
{
ThrowIfDisposed();
- return OUString("ThumbnailView");
+ return "ThumbnailView";
}
OUString SAL_CALL SfxThumbnailViewAcc::getAccessibleName()
diff --git a/sfx2/source/dialog/backingcomp.cxx
b/sfx2/source/dialog/backingcomp.cxx
index 22df8b24937a..2e36f8f18887 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -271,7 +271,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL
BackingComp::getImplementationId()
OUString SAL_CALL BackingComp::getImplementationName()
{
- return OUString("com.sun.star.comp.sfx2.BackingComp");
+ return "com.sun.star.comp.sfx2.BackingComp";
}
sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const OUString&
sServiceName )
diff --git a/sfx2/source/dialog/filtergrouping.cxx
b/sfx2/source/dialog/filtergrouping.cxx
index a59d7c8159c6..62d58ceee285 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -395,7 +395,7 @@ namespace sfx2
static OUString getSeparatorString()
{
- return OUString(";");
+ return ";";
}
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index a9d248a2738c..ad5417688fdc 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -326,7 +326,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override
{
- return OUString("CompatWriterDocPropsImpl");
+ return "CompatWriterDocPropsImpl";
}
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
override
@@ -1264,7 +1264,7 @@ SfxDocumentMetaData::SfxDocumentMetaData(
OUString SAL_CALL
SfxDocumentMetaData::getImplementationName()
{
- return OUString("SfxDocumentMetaData");
+ return "SfxDocumentMetaData";
}
sal_Bool SAL_CALL
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 7c980be3b77f..6780825e7dcd 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2130,7 +2130,7 @@ public:
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.comp.sfx2.DocumentTemplates");
+ return "com.sun.star.comp.sfx2.DocumentTemplates";
}
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
override
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index e9bc3f0aabe9..2bbdd75ae027 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -70,7 +70,7 @@ public:
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.comp.sfx2.IFrameObject");
+ return "com.sun.star.comp.sfx2.IFrameObject";
}
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
override
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index d4b30edfa5b2..4a1fb448b7b1 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -709,7 +709,7 @@ OUString SfxObjectShell::GetTitle( sal_uInt16 nMaxLength )
const
{
static bool bRecur = false;
if ( bRecur )
- return OUString("-not available-");
+ return "-not available-";
bRecur = true;
OUString aTitle;
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx
b/sfx2/source/doc/ownsubfilterservice.cxx
index ee002aacfd93..abe4b5c63c44 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -96,7 +96,7 @@ void SAL_CALL OwnSubFilterService::cancel()
OUString SAL_CALL OwnSubFilterService::getImplementationName()
{
- return OUString("com.sun.star.comp.document.OwnSubFilter");
+ return "com.sun.star.comp.document.OwnSubFilter";
}
sal_Bool SAL_CALL OwnSubFilterService::supportsService( const OUString&
ServiceName )
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index c31e0d9f43d6..eafa8d955da6 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -111,19 +111,19 @@ static OUString lcl_getAppName(
vcl::EnumContext::Application eApp )
switch ( eApp )
{
case vcl::EnumContext::Application::Writer:
- return OUString( "Writer" );
+ return "Writer";
break;
case vcl::EnumContext::Application::Calc:
- return OUString( "Calc" );
+ return "Calc";
break;
case vcl::EnumContext::Application::Impress:
- return OUString( "Impress" );
+ return "Impress";
break;
case vcl::EnumContext::Application::Draw:
- return OUString( "Draw" );
+ return "Draw";
break;
case vcl::EnumContext::Application::Formula:
- return OUString( "Formula" );
+ return "Formula";
break;
default:
return OUString();
diff --git a/sfx2/source/notify/globalevents.cxx
b/sfx2/source/notify/globalevents.cxx
index cf15a8b7ff09..cfb994ac30f1 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -76,7 +76,7 @@ public:
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.comp.sfx2.GlobalEventBroadcaster");
+ return "com.sun.star.comp.sfx2.GlobalEventBroadcaster";
}
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
override
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 48f7291e8af7..cfef7c774db0 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -341,7 +341,7 @@ static const OUString GetWindowClassification(const
vcl::Window* pWindow)
}
else
{
- return OUString("window");
+ return "window";
}
}
diff --git a/sfx2/source/view/classificationcontroller.cxx
b/sfx2/source/view/classificationcontroller.cxx
index 0bb7b2daea70..05a6c6b93b8e 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -137,7 +137,7 @@
ClassificationCategoriesController::ClassificationCategoriesController(const uno
OUString ClassificationCategoriesController::getImplementationName()
{
- return
OUString("com.sun.star.comp.sfx2.ClassificationCategoriesController");
+ return "com.sun.star.comp.sfx2.ClassificationCategoriesController";
}
sal_Bool ClassificationCategoriesController::supportsService(const OUString&
rServiceName)
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 9d609cd6a039..499149c54b83 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -753,7 +753,7 @@ void SfxFrameLoader_Impl::cancel()
/* XServiceInfo */
OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName()
{
- return OUString("com.sun.star.comp.office.FrameLoader");
+ return "com.sun.star.comp.office.FrameLoader";
}
/* XServiceInfo */
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index fb9da0d9ef40..c3e98aefe27c 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -39,7 +39,7 @@ OUString SfxViewFactory::GetAPIViewName() const
return m_sViewName;
if ( GetOrdinal() == SFX_INTERFACE_NONE )
- return OUString( "Default" );
+ return "Default";
return GetLegacyViewName();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
