include/unotools/compatibility.hxx | 4
include/vbahelper/vbacollectionimpl.hxx | 2
include/vbahelper/vbahelperinterface.hxx | 2
include/vbahelper/vbapropvalue.hxx | 2
include/vbahelper/vbareturntypes.hxx | 2
unotools/source/config/fontcfg.cxx | 14 -
unotools/source/config/moduleoptions.cxx | 20 -
unotools/source/i18n/resmgr.cxx | 2
unoxml/source/dom/cdatasection.cxx | 2
unoxml/source/dom/comment.cxx | 2
unoxml/source/dom/document.cxx | 2
unoxml/source/dom/documentbuilder.cxx | 2
unoxml/source/dom/documentfragment.cxx | 2
unoxml/source/dom/saxbuilder.cxx | 2
unoxml/source/dom/text.cxx | 2
unoxml/source/rdf/CBlankNode.cxx | 2
unoxml/source/rdf/CLiteral.cxx | 2
unoxml/source/rdf/CURI.cxx | 4
unoxml/source/rdf/librdf_repository.cxx | 2
unoxml/source/xpath/xpathapi.cxx | 2
uui/source/interactionhandler.cxx | 2
uui/source/passwordcontainer.cxx | 2
uui/source/requeststringresolver.cxx | 2
vbahelper/source/msforms/vbabutton.cxx | 2
vbahelper/source/msforms/vbacheckbox.cxx | 2
vbahelper/source/msforms/vbacheckbox.hxx | 2
vbahelper/source/msforms/vbacombobox.cxx | 2
vbahelper/source/msforms/vbacombobox.hxx | 2
vbahelper/source/msforms/vbacontrol.cxx | 2
vbahelper/source/msforms/vbaimage.cxx | 2
vbahelper/source/msforms/vbalabel.cxx | 2
vbahelper/source/msforms/vbalabel.hxx | 2
vbahelper/source/msforms/vbalistbox.cxx | 2
vbahelper/source/msforms/vbalistbox.hxx | 2
vbahelper/source/msforms/vbamultipage.cxx | 2
vbahelper/source/msforms/vbapages.cxx | 2
vbahelper/source/msforms/vbaprogressbar.cxx | 2
vbahelper/source/msforms/vbaprogressbar.hxx | 2
vbahelper/source/msforms/vbaradiobutton.cxx | 2
vbahelper/source/msforms/vbaradiobutton.hxx | 2
vbahelper/source/msforms/vbascrollbar.cxx | 2
vbahelper/source/msforms/vbaspinbutton.cxx | 2
vbahelper/source/msforms/vbasystemaxcontrol.cxx | 2
vbahelper/source/msforms/vbatextbox.cxx | 2
vbahelper/source/msforms/vbatextbox.hxx | 2
vbahelper/source/msforms/vbatogglebutton.cxx | 2
vbahelper/source/msforms/vbatogglebutton.hxx | 2
vbahelper/source/msforms/vbauserform.cxx | 2
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 4
vbahelper/source/vbahelper/vbacolorformat.cxx | 2
vbahelper/source/vbahelper/vbacommandbar.cxx | 4
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx | 6
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 4
vbahelper/source/vbahelper/vbacommandbars.cxx | 2
vbahelper/source/vbahelper/vbadocumentbase.cxx | 2
vbahelper/source/vbahelper/vbafillformat.cxx | 2
vbahelper/source/vbahelper/vbalineformat.cxx | 12 -
vbahelper/source/vbahelper/vbapictureformat.cxx | 2
vbahelper/source/vbahelper/vbashape.cxx | 2
vbahelper/source/vbahelper/vbashaperange.cxx | 2
vbahelper/source/vbahelper/vbashapes.cxx | 2
vbahelper/source/vbahelper/vbatextframe.cxx | 2
vbahelper/source/vbahelper/vbawindowbase.cxx | 2
vcl/inc/salinst.hxx | 2
vcl/qt5/Qt5AccessibleWidget.cxx | 18 -
vcl/qt5/Qt5Clipboard.cxx | 5
vcl/qt5/Qt5DragAndDrop.cxx | 4
vcl/qt5/Qt5FilePicker.cxx | 2
vcl/source/app/IconThemeSelector.cxx | 4
vcl/source/app/session.cxx | 2
vcl/source/components/dtranscomp.cxx | 18 -
vcl/source/components/fontident.cxx | 2
vcl/source/control/field2.cxx | 2
vcl/source/gdi/mtfxmldump.cxx | 218 +++++++++----------
vcl/source/graphic/UnoGraphic.cxx | 2
vcl/source/graphic/UnoGraphicDescriptor.cxx | 2
vcl/source/graphic/UnoGraphicObject.cxx | 2
vcl/source/graphic/UnoGraphicProvider.cxx | 2
vcl/source/helper/strhelper.cxx | 4
vcl/source/opengl/OpenGLHelper.cxx | 2
vcl/source/treelist/transfer.cxx | 2
vcl/source/treelist/uiobject.cxx | 4
vcl/source/uitest/logger.cxx | 2
vcl/source/uitest/uiobject.cxx | 28 +-
vcl/source/uitest/uno/uiobject_uno.cxx | 2
vcl/source/uitest/uno/uitest_uno.cxx | 2
vcl/source/window/builder.cxx | 8
vcl/unx/generic/dtrans/X11_clipboard.cxx | 2
vcl/unx/generic/dtrans/X11_droptarget.cxx | 2
vcl/unx/generic/dtrans/X11_selection.cxx | 2
vcl/unx/gtk3/gtk3gtkinst.cxx | 6
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx | 5
vcl/unx/kf5/KF5FilePicker.cxx | 2
vcl/workben/vcldemo.cxx | 2
94 files changed, 267 insertions(+), 273 deletions(-)
New commits:
commit ed96bbd34403277abbe37c06f0e74a3c09f54979
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:46:21 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:53:03 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): unotools
Change-Id: Idc40b72de04ee17dcc60913cc5f81f5f69dd57e9
Reviewed-on: https://gerrit.libreoffice.org/76631
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/include/unotools/compatibility.hxx
b/include/unotools/compatibility.hxx
index de5585313b92..ed3e14f5026d 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -73,12 +73,12 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
static OUString getUserEntryName()
{
- return OUString( "_user" );
+ return "_user";
}
static OUString getDefaultEntryName()
{
- return OUString( "_default" );
+ return "_default";
}
static Index getIndex( const OUString& rName )
diff --git a/unotools/source/config/fontcfg.cxx
b/unotools/source/config/fontcfg.cxx
index 50c45600d24b..2b1d3f24fb1f 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -254,15 +254,15 @@ OUString DefaultFontConfiguration::getUserInterfaceFont(
const LanguageTag& rLan
// optimize font list for some locales, as long as Andale Sans UI does not
support them
if( aLanguage == "ar" || aLanguage == "he" || aLanguage == "iw" )
{
- return OUString(FALLBACKFONT_UI_SANS_ARABIC);
+ return FALLBACKFONT_UI_SANS_ARABIC;
}
else if ( aLanguage == "th" )
{
- return OUString(FALLBACKFONT_UI_SANS_THAI);
+ return FALLBACKFONT_UI_SANS_THAI;
}
else if ( aLanguage == "ko" )
{
- return OUString(FALLBACKFONT_UI_SANS_KOREAN);
+ return FALLBACKFONT_UI_SANS_KOREAN;
}
else if( aLanguage == "cs" ||
aLanguage == "hu" ||
@@ -274,18 +274,18 @@ OUString DefaultFontConfiguration::getUserInterfaceFont(
const LanguageTag& rLan
aLanguage == "sl" ||
aLanguage == "sb")
{
- return OUString(FALLBACKFONT_UI_SANS_LATIN2);
+ return FALLBACKFONT_UI_SANS_LATIN2;
}
else
{
const Locale& aLocale( aLanguageTag.getLocale());
if (MsLangId::isTraditionalChinese(aLocale))
- return OUString(FALLBACKFONT_UI_SANS_CHINTRD);
+ return FALLBACKFONT_UI_SANS_CHINTRD;
else if (MsLangId::isSimplifiedChinese(aLocale))
- return OUString(FALLBACKFONT_UI_SANS_CHINSIM);
+ return FALLBACKFONT_UI_SANS_CHINSIM;
}
- return OUString(FALLBACKFONT_UI_SANS);
+ return FALLBACKFONT_UI_SANS;
}
/*
diff --git a/unotools/source/config/moduleoptions.cxx
b/unotools/source/config/moduleoptions.cxx
index 0b4e86f8dad8..e4c32683931c 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -922,16 +922,16 @@ OUString SvtModuleOptions::GetModuleName( EModule eModule
) const
{
switch( eModule )
{
- case SvtModuleOptions::EModule::WRITER : { return
OUString("Writer"); }
- case SvtModuleOptions::EModule::WEB : { return
OUString("Web"); }
- case SvtModuleOptions::EModule::GLOBAL : { return
OUString("Global"); }
- case SvtModuleOptions::EModule::CALC : { return
OUString("Calc"); }
- case SvtModuleOptions::EModule::DRAW : { return
OUString("Draw"); }
- case SvtModuleOptions::EModule::IMPRESS : { return
OUString("Impress"); }
- case SvtModuleOptions::EModule::MATH : { return
OUString("Math"); }
- case SvtModuleOptions::EModule::CHART : { return
OUString("Chart"); }
- case SvtModuleOptions::EModule::BASIC : { return
OUString("Basic"); }
- case SvtModuleOptions::EModule::DATABASE : { return
OUString("Database"); }
+ case SvtModuleOptions::EModule::WRITER : { return "Writer"; }
+ case SvtModuleOptions::EModule::WEB : { return "Web"; }
+ case SvtModuleOptions::EModule::GLOBAL : { return "Global"; }
+ case SvtModuleOptions::EModule::CALC : { return "Calc"; }
+ case SvtModuleOptions::EModule::DRAW : { return "Draw"; }
+ case SvtModuleOptions::EModule::IMPRESS : { return "Impress"; }
+ case SvtModuleOptions::EModule::MATH : { return "Math"; }
+ case SvtModuleOptions::EModule::CHART : { return "Chart"; }
+ case SvtModuleOptions::EModule::BASIC : { return "Basic"; }
+ case SvtModuleOptions::EModule::DATABASE : { return "Database"; }
default:
OSL_FAIL( "unknown module" );
break;
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 32fb86bdcf02..bb75cc61fed8 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -86,7 +86,7 @@ namespace
nCRC >>= 6;
}
sKeyId[5] = '\0';
- return OString(sKeyId);
+ return sKeyId;
}
}
commit e76e9e5d7299d88137d57aefe174a84474e2909c
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:46:12 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:52:54 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): unoxml
Change-Id: If4445eabc4216d2fce7a08da85e806408064d7bb
Reviewed-on: https://gerrit.libreoffice.org/76630
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/unoxml/source/dom/cdatasection.cxx
b/unoxml/source/dom/cdatasection.cxx
index c0cf2d418b3b..47dc773893bc 100644
--- a/unoxml/source/dom/cdatasection.cxx
+++ b/unoxml/source/dom/cdatasection.cxx
@@ -48,7 +48,7 @@ namespace DOM
OUString SAL_CALL CCDATASection::getNodeName()
{
- return OUString( "#cdata-section" );
+ return "#cdata-section";
}
OUString SAL_CALL CCDATASection::getNodeValue()
diff --git a/unoxml/source/dom/comment.cxx b/unoxml/source/dom/comment.cxx
index 179a0f2da5ff..30bcb30aa0f4 100644
--- a/unoxml/source/dom/comment.cxx
+++ b/unoxml/source/dom/comment.cxx
@@ -44,7 +44,7 @@ namespace DOM
OUString SAL_CALL CComment::getNodeName()
{
- return OUString("#comment");
+ return "#comment";
}
OUString SAL_CALL CComment::getNodeValue()
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 4b7d246e867d..e84ff5bdc8d3 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -906,7 +906,7 @@ namespace DOM
OUString SAL_CALL CDocument::getNodeName()
{
// does not need mutex currently
- return OUString("#document");
+ return "#document";
}
OUString SAL_CALL CDocument::getNodeValue()
diff --git a/unoxml/source/dom/documentbuilder.cxx
b/unoxml/source/dom/documentbuilder.cxx
index 5f08a7bc3236..3b5082ae8774 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -110,7 +110,7 @@ namespace DOM
OUString CDocumentBuilder::_getImplementationName()
{
- return OUString(aImplementationName);
+ return aImplementationName;
}
Sequence<OUString> CDocumentBuilder::_getSupportedServiceNames()
{
diff --git a/unoxml/source/dom/documentfragment.cxx
b/unoxml/source/dom/documentfragment.cxx
index ce94a844ec3a..62c69b4db8e5 100644
--- a/unoxml/source/dom/documentfragment.cxx
+++ b/unoxml/source/dom/documentfragment.cxx
@@ -49,7 +49,7 @@ namespace DOM
OUString SAL_CALL CDocumentFragment::getNodeName()
{
- return OUString("#document-fragment");
+ return "#document-fragment";
}
OUString SAL_CALL CDocumentFragment::getNodeValue()
{
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index 968971f29d2c..5769ad579666 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -51,7 +51,7 @@ namespace DOM
OUString CSAXDocumentBuilder::_getImplementationName()
{
- return OUString(aImplementationName);
+ return aImplementationName;
}
Sequence<OUString> CSAXDocumentBuilder::_getSupportedServiceNames()
{
diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx
index 10e8e271b749..08db01ba32c4 100644
--- a/unoxml/source/dom/text.cxx
+++ b/unoxml/source/dom/text.cxx
@@ -60,7 +60,7 @@ namespace DOM
OUString SAL_CALL CText::getNodeName()
{
- return OUString("#text");
+ return "#text";
}
Reference< XText > SAL_CALL CText::splitText(sal_Int32 /*offset*/)
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index f5cd28801d0c..44d0017bbe44 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -113,7 +113,7 @@ OUString SAL_CALL CBlankNode::getStringValue()
namespace comp_CBlankNode {
OUString _getImplementationName() {
- return OUString( "CBlankNode");
+ return "CBlankNode";
}
css::uno::Sequence< OUString > _getSupportedServiceNames()
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index 214989495741..e0aa7f1481a8 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -171,7 +171,7 @@ css::uno::Reference< css::rdf::XURI > SAL_CALL
CLiteral::getDatatype()
namespace comp_CLiteral {
OUString _getImplementationName() {
- return OUString( "CLiteral");
+ return "CLiteral";
}
css::uno::Sequence< OUString > _getSupportedServiceNames()
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index 971303beb92f..cef43fa22488 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -794,8 +794,8 @@ OUString SAL_CALL CURI::getLocalName()
namespace comp_CURI {
OUString _getImplementationName() {
- return OUString(
- "CURI");
+ return
+ "CURI";
}
css::uno::Sequence< OUString > _getSupportedServiceNames()
diff --git a/unoxml/source/rdf/librdf_repository.cxx
b/unoxml/source/rdf/librdf_repository.cxx
index 4e7b8382b5a6..eb15843ef25b 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -2465,7 +2465,7 @@
librdf_TypeConverter::convertToStatement(librdf_statement* i_pStmt,
namespace comp_librdf_Repository {
OUString _getImplementationName() {
- return OUString("librdf_Repository");
+ return "librdf_Repository";
}
uno::Sequence< OUString > _getSupportedServiceNames()
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index 874f4e6cd114..334cd19f18cd 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -67,7 +67,7 @@ namespace XPath
OUString CXPathAPI::_getImplementationName()
{
- return OUString(aImplementationName);
+ return aImplementationName;
}
Sequence<OUString> CXPathAPI::_getSupportedServiceNames()
commit 28065fe9bd06617815b27e329a33b0ebb545c48d
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:46:03 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:52:48 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): uui
Change-Id: I847a44085d50a431d8b40ccd1cacbb1cfa712e68
Reviewed-on: https://gerrit.libreoffice.org/76629
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/uui/source/interactionhandler.cxx
b/uui/source/interactionhandler.cxx
index 850eb59b0106..71286345a177 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -79,7 +79,7 @@ UUIInteractionHandler::UUIInteractionHandler(
OUString SAL_CALL UUIInteractionHandler::getImplementationName()
{
- return OUString("com.sun.star.comp.uui.UUIInteractionHandler");
+ return "com.sun.star.comp.uui.UUIInteractionHandler";
}
sal_Bool SAL_CALL
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 7b94a87fd14d..c48f3cd2c029 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -317,7 +317,7 @@
PasswordContainerInteractionHandler::getSupportedServiceNames()
OUString
PasswordContainerInteractionHandler::getImplementationName_Static()
{
- return OUString(
"com.sun.star.comp.uui.PasswordContainerInteractionHandler" );
+ return "com.sun.star.comp.uui.PasswordContainerInteractionHandler";
}
diff --git a/uui/source/requeststringresolver.cxx
b/uui/source/requeststringresolver.cxx
index 98a4fdb23983..e9d73f0749da 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -39,7 +39,7 @@
UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver()
OUString SAL_CALL
UUIInteractionRequestStringResolver::getImplementationName()
{
- return
OUString("com.sun.star.comp.uui.UUIInteractionRequestStringResolver");
+ return "com.sun.star.comp.uui.UUIInteractionRequestStringResolver";
}
sal_Bool SAL_CALL
commit d69da8657043b865d9afc3ea93eba9f10e4913e3
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:45:52 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:52:40 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): vbahelper
Change-Id: I10c543744f22a9f4db4e99c97629bb0e0b7f37db
Reviewed-on: https://gerrit.libreoffice.org/76628
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/include/vbahelper/vbacollectionimpl.hxx
b/include/vbahelper/vbacollectionimpl.hxx
index 9234f4ad2119..26853ad9077c 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -313,7 +313,7 @@ public:
// XDefaultMethod
OUString SAL_CALL getDefaultMethodName( ) override
{
- return OUString("Item");
+ return "Item";
}
// XEnumerationAccess
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration() override = 0;
diff --git a/include/vbahelper/vbahelperinterface.hxx
b/include/vbahelper/vbahelperinterface.hxx
index fdcdaca9c204..20f3d7ab77ce 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -131,7 +131,7 @@ public:
#define VBAHELPER_IMPL_XHELPERINTERFACE( classname, servicename ) \
OUString classname::getServiceImplName() \
{ \
- return OUString( #classname ); \
+ return #classname; \
} \
css::uno::Sequence< OUString > classname::getServiceNames() \
{ \
diff --git a/include/vbahelper/vbapropvalue.hxx
b/include/vbahelper/vbapropvalue.hxx
index 0ea4417595d7..7c9e4bdda8ab 100644
--- a/include/vbahelper/vbapropvalue.hxx
+++ b/include/vbahelper/vbapropvalue.hxx
@@ -51,7 +51,7 @@ public:
virtual css::uno::Any SAL_CALL getValue() override;
virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
- OUString SAL_CALL getDefaultPropertyName() override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName() override { return "Value"; }
};
#endif //SC_VBA_PROPVALULE_HXX
diff --git a/include/vbahelper/vbareturntypes.hxx
b/include/vbahelper/vbareturntypes.hxx
index 8a500ff24f94..746107358214 100644
--- a/include/vbahelper/vbareturntypes.hxx
+++ b/include/vbahelper/vbareturntypes.hxx
@@ -39,7 +39,7 @@ namespace ooo
DefaultReturnHelper( const T1& nValue ) : mnValue( nValue ) {}
virtual void SAL_CALL setValue( T1 nValue ) override { mnValue =
nValue; }
virtual T1 SAL_CALL getValue() override { return mnValue; }
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
"Value"; }
};
typedef DefaultReturnHelper< sal_Int32, ov::msforms::XReturnInteger >
ReturnInteger_BASE;
diff --git a/vbahelper/source/msforms/vbabutton.cxx
b/vbahelper/source/msforms/vbabutton.cxx
index 7c7e98143432..b1d07ba9911c 100644
--- a/vbahelper/source/msforms/vbabutton.cxx
+++ b/vbahelper/source/msforms/vbabutton.cxx
@@ -112,7 +112,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
VbaButton::getFont()
OUString
VbaButton::getServiceImplName()
{
- return OUString("VbaButton");
+ return "VbaButton";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbacheckbox.cxx
b/vbahelper/source/msforms/vbacheckbox.cxx
index 719fd3183696..6444d9dab526 100644
--- a/vbahelper/source/msforms/vbacheckbox.cxx
+++ b/vbahelper/source/msforms/vbacheckbox.cxx
@@ -86,7 +86,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaCheckbox::getFont()
OUString
ScVbaCheckbox::getServiceImplName()
{
- return OUString("ScVbaCheckbox");
+ return "ScVbaCheckbox";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbacheckbox.hxx
b/vbahelper/source/msforms/vbacheckbox.hxx
index 561ee3c12abc..7053e0aec2a2 100644
--- a/vbahelper/source/msforms/vbacheckbox.hxx
+++ b/vbahelper/source/msforms/vbacheckbox.hxx
@@ -43,7 +43,7 @@ public:
virtual sal_Bool SAL_CALL getLocked() override;
virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
//XHelperInterface
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacombobox.cxx
b/vbahelper/source/msforms/vbacombobox.cxx
index 3f4468d7d07a..429ef73a2219 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -253,7 +253,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaComboBox::getFont()
OUString
ScVbaComboBox::getServiceImplName()
{
- return OUString("ScVbaComboBox");
+ return "ScVbaComboBox";
}
sal_Int32 SAL_CALL ScVbaComboBox::getBackColor()
diff --git a/vbahelper/source/msforms/vbacombobox.hxx
b/vbahelper/source/msforms/vbacombobox.hxx
index 68898a9f6cea..feea8e52c504 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -79,7 +79,7 @@ public:
virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
"Value"; }
//XHelperInterface
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacontrol.cxx
b/vbahelper/source/msforms/vbacontrol.cxx
index 48cced0e8730..ba0a6f994035 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -696,7 +696,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32
/*nTabIndex*/ )
OUString
ScVbaControl::getServiceImplName()
{
- return OUString("ScVbaControl");
+ return "ScVbaControl";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbaimage.cxx
b/vbahelper/source/msforms/vbaimage.cxx
index 1deeaf249f31..827544168676 100644
--- a/vbahelper/source/msforms/vbaimage.cxx
+++ b/vbahelper/source/msforms/vbaimage.cxx
@@ -30,7 +30,7 @@ ScVbaImage::ScVbaImage( const uno::Reference<
XHelperInterface >& xParent, const
OUString
ScVbaImage::getServiceImplName()
{
- return OUString("ScVbaImage");
+ return "ScVbaImage";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbalabel.cxx
b/vbahelper/source/msforms/vbalabel.cxx
index 567cd6b79c4a..df4ac8be08df 100644
--- a/vbahelper/source/msforms/vbalabel.cxx
+++ b/vbahelper/source/msforms/vbalabel.cxx
@@ -76,7 +76,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaLabel::getFont()
OUString ScVbaLabel::getServiceImplName()
{
- return OUString( "ScVbaLabel" );
+ return "ScVbaLabel";
}
sal_Int32 SAL_CALL ScVbaLabel::getBackColor()
diff --git a/vbahelper/source/msforms/vbalabel.hxx
b/vbahelper/source/msforms/vbalabel.hxx
index f11c3cdae7e2..d002557bb4c9 100644
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
@@ -46,7 +46,7 @@ public:
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALABEL_HXX
diff --git a/vbahelper/source/msforms/vbalistbox.cxx
b/vbahelper/source/msforms/vbalistbox.cxx
index cb35e7b58b40..4e3467abdb44 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -261,7 +261,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaListBox::getFont()
OUString
ScVbaListBox::getServiceImplName()
{
- return OUString("ScVbaListBox");
+ return "ScVbaListBox";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbalistbox.hxx
b/vbahelper/source/msforms/vbalistbox.hxx
index 71912fa06e15..b87f9e74f7dd 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -63,7 +63,7 @@ public:
virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
//XHelperInterface
virtual OUString getServiceImplName() override;
diff --git a/vbahelper/source/msforms/vbamultipage.cxx
b/vbahelper/source/msforms/vbamultipage.cxx
index 0608c1d64bda..18c74ffdff30 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -86,7 +86,7 @@ ScVbaMultiPage::setValue( const sal_Int32 _value )
OUString
ScVbaMultiPage::getServiceImplName()
{
- return OUString( "ScVbaMultiPage" );
+ return "ScVbaMultiPage";
}
uno::Any SAL_CALL
diff --git a/vbahelper/source/msforms/vbapages.cxx
b/vbahelper/source/msforms/vbapages.cxx
index c40aaa8fdf90..05e0f25c110d 100644
--- a/vbahelper/source/msforms/vbapages.cxx
+++ b/vbahelper/source/msforms/vbapages.cxx
@@ -41,7 +41,7 @@ ScVbaPages::createCollectionObject( const css::uno::Any&
aSource )
OUString
ScVbaPages::getServiceImplName()
{
- return OUString( "ScVbaPages" );
+ return "ScVbaPages";
}
uno::Reference< container::XEnumeration > SAL_CALL
diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx
b/vbahelper/source/msforms/vbaprogressbar.cxx
index 64b6726905ff..b6c3513ab7d3 100644
--- a/vbahelper/source/msforms/vbaprogressbar.cxx
+++ b/vbahelper/source/msforms/vbaprogressbar.cxx
@@ -45,7 +45,7 @@ ScVbaProgressBar::setValue( const uno::Any& _value )
OUString
ScVbaProgressBar::getServiceImplName()
{
- return OUString( "ScVbaProgressBar" );
+ return "ScVbaProgressBar";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx
b/vbahelper/source/msforms/vbaprogressbar.hxx
index 3b505d6fd120..3822acf21527 100644
--- a/vbahelper/source/msforms/vbaprogressbar.hxx
+++ b/vbahelper/source/msforms/vbaprogressbar.hxx
@@ -39,7 +39,7 @@ public:
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAPROGRESSBAR_HXX
diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx
b/vbahelper/source/msforms/vbaradiobutton.cxx
index 8328dff14d76..5a00c21e0d98 100644
--- a/vbahelper/source/msforms/vbaradiobutton.cxx
+++ b/vbahelper/source/msforms/vbaradiobutton.cxx
@@ -94,7 +94,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaRadioButton::getFont()
OUString
ScVbaRadioButton::getServiceImplName()
{
- return OUString( "ScVbaRadioButton" );
+ return "ScVbaRadioButton";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx
b/vbahelper/source/msforms/vbaradiobutton.hxx
index 047789597e9d..ffa5a542c6b8 100644
--- a/vbahelper/source/msforms/vbaradiobutton.hxx
+++ b/vbahelper/source/msforms/vbaradiobutton.hxx
@@ -39,7 +39,7 @@ public:
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBARADIOBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbascrollbar.cxx
b/vbahelper/source/msforms/vbascrollbar.cxx
index 10c49e79c16b..4968c72826b6 100644
--- a/vbahelper/source/msforms/vbascrollbar.cxx
+++ b/vbahelper/source/msforms/vbascrollbar.cxx
@@ -99,7 +99,7 @@ ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange )
OUString
ScVbaScrollBar::getServiceImplName()
{
- return OUString("ScVbaScrollBar" );
+ return "ScVbaScrollBar";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx
b/vbahelper/source/msforms/vbaspinbutton.cxx
index 1da95fcedc55..3180f4861e83 100644
--- a/vbahelper/source/msforms/vbaspinbutton.cxx
+++ b/vbahelper/source/msforms/vbaspinbutton.cxx
@@ -71,7 +71,7 @@ ScVbaSpinButton::setMin( sal_Int32 nVal )
OUString
ScVbaSpinButton::getServiceImplName()
{
- return OUString( "ScVbaSpinButton" );
+ return "ScVbaSpinButton";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx
b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
index d1c42c3746b2..ea135e270b00 100644
--- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx
+++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
@@ -68,7 +68,7 @@ sal_Bool SAL_CALL VbaSystemAXControl::hasProperty( const
OUString& aName )
OUString
VbaSystemAXControl::getServiceImplName()
{
- return OUString( "VbaSystemAXControl" );
+ return "VbaSystemAXControl";
}
diff --git a/vbahelper/source/msforms/vbatextbox.cxx
b/vbahelper/source/msforms/vbatextbox.cxx
index 4c2e7a89b73d..59f736d48dcc 100644
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
@@ -167,7 +167,7 @@ void SAL_CALL ScVbaTextBox::setLocked( sal_Bool bLocked )
OUString
ScVbaTextBox::getServiceImplName()
{
- return OUString( "ScVbaTextBox" );
+ return "ScVbaTextBox";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbatextbox.hxx
b/vbahelper/source/msforms/vbatextbox.hxx
index 248106fb7877..debf3994de40 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -55,7 +55,7 @@ public:
virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
//XHelperInterface
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx
b/vbahelper/source/msforms/vbatogglebutton.cxx
index 61b6562f0beb..fbb7c267a428 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -148,7 +148,7 @@ void SAL_CALL ScVbaToggleButton::setLocked( sal_Bool
bLocked )
OUString
ScVbaToggleButton::getServiceImplName()
{
- return OUString( "ScVbaToggleButton" );
+ return "ScVbaToggleButton";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx
b/vbahelper/source/msforms/vbatogglebutton.hxx
index fbedac3cdd37..dc6a440a5f1b 100644
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
@@ -53,7 +53,7 @@ public:
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
OUString("Value"); }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATOGGLEBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbauserform.cxx
b/vbahelper/source/msforms/vbauserform.cxx
index a22f15d41dae..c29c9782b3c9 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -182,7 +182,7 @@ ScVbaUserForm::UnloadObject( )
OUString
ScVbaUserForm::getServiceImplName()
{
- return OUString("ScVbaUserForm");
+ return "ScVbaUserForm";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 6b647e26db1c..90c7e83badc6 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -316,7 +316,7 @@ VbaApplicationBase::CommandBars( const uno::Any& aIndex )
OUString SAL_CALL
VbaApplicationBase::getVersion()
{
- return OUString(OFFICEVERSION);
+ return OFFICEVERSION;
}
uno::Any SAL_CALL VbaApplicationBase::Run( const OUString& MacroName, const
uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any&
varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7,
const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const
uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const
uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const
uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const
uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const
uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const
uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const
uno::Any& varg29, const uno::Any& varg30 )
@@ -425,7 +425,7 @@ uno::Any SAL_CALL VbaApplicationBase::getVBE()
OUString
VbaApplicationBase::getServiceImplName()
{
- return OUString("VbaApplicationBase");
+ return "VbaApplicationBase";
}
uno::Sequence<OUString>
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx
b/vbahelper/source/vbahelper/vbacolorformat.cxx
index fc4301a4490f..7c72c65a1eeb 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -154,7 +154,7 @@ ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor )
OUString
ScVbaColorFormat::getServiceImplName()
{
- return OUString("ScVbaColorFormat");
+ return "ScVbaColorFormat";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx
b/vbahelper/source/vbahelper/vbacommandbar.cxx
index c0316c1b51d7..c1adf36f681a 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -177,7 +177,7 @@ ScVbaCommandBar::FindControl( const uno::Any& /*aType*/,
const uno::Any& /*aId*/
OUString
ScVbaCommandBar::getServiceImplName()
{
- return OUString("ScVbaCommandBar");
+ return "ScVbaCommandBar";
}
uno::Sequence<OUString>
@@ -259,7 +259,7 @@ uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const
uno::Any& /*aType*/, co
OUString VbaDummyCommandBar::getServiceImplName()
{
- return OUString("VbaDummyCommandBar");
+ return "VbaDummyCommandBar";
}
uno::Sequence< OUString > VbaDummyCommandBar::getServiceNames()
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index 27d98cbd9241..d7220f071e8d 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -179,7 +179,7 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex )
OUString
ScVbaCommandBarControl::getServiceImplName()
{
- return OUString("ScVbaCommandBarControl");
+ return "ScVbaCommandBarControl";
}
uno::Sequence<OUString>
@@ -209,7 +209,7 @@ ScVbaCommandBarPopup::ScVbaCommandBarPopup( const
css::uno::Reference< ov::XHelp
OUString
ScVbaCommandBarPopup::getServiceImplName()
{
- return OUString("ScVbaCommandBarPopup");
+ return "ScVbaCommandBarPopup";
}
uno::Sequence<OUString>
@@ -239,7 +239,7 @@ ScVbaCommandBarButton::ScVbaCommandBarButton( const
css::uno::Reference< ov::XHe
OUString
ScVbaCommandBarButton::getServiceImplName()
{
- return OUString("ScVbaCommandBarButton");
+ return "ScVbaCommandBarButton";
}
uno::Sequence<OUString>
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 830a922c2d09..f789a487f6b2 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -230,7 +230,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const
uno::Any& Id, const un
OUString
ScVbaCommandBarControls::getServiceImplName()
{
- return OUString("ScVbaCommandBarControls");
+ return "ScVbaCommandBarControls";
}
uno::Sequence<OUString>
@@ -299,7 +299,7 @@ uno::Reference< XCommandBarControl > SAL_CALL
VbaDummyCommandBarControls::Add(
// XHelperInterface
OUString VbaDummyCommandBarControls::getServiceImplName()
{
- return OUString("VbaDummyCommandBarControls");
+ return "VbaDummyCommandBarControls";
}
uno::Sequence<OUString> VbaDummyCommandBarControls::getServiceNames()
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx
b/vbahelper/source/vbahelper/vbacommandbars.cxx
index b771e3d541cf..be173f49b2a7 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -220,7 +220,7 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const
uno::Any& /*aIndex2*/ )
OUString
ScVbaCommandBars::getServiceImplName()
{
- return OUString("ScVbaCommandBars");
+ return "ScVbaCommandBars";
}
uno::Sequence<OUString>
diff --git a/vbahelper/source/vbahelper/vbadocumentbase.cxx
b/vbahelper/source/vbahelper/vbadocumentbase.cxx
index e8686824dc6c..39aea5b2db18 100644
--- a/vbahelper/source/vbahelper/vbadocumentbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentbase.cxx
@@ -296,7 +296,7 @@ VbaDocumentBase::getVBProject()
OUString
VbaDocumentBase::getServiceImplName()
{
- return OUString( "VbaDocumentBase" );
+ return "VbaDocumentBase";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx
b/vbahelper/source/vbahelper/vbafillformat.cxx
index acc748de395d..e72be2c908fc 100644
--- a/vbahelper/source/vbahelper/vbafillformat.cxx
+++ b/vbahelper/source/vbahelper/vbafillformat.cxx
@@ -171,7 +171,7 @@ ScVbaFillFormat::ForeColor()
OUString
ScVbaFillFormat::getServiceImplName()
{
- return OUString("ScVbaFillFormat");
+ return "ScVbaFillFormat";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx
b/vbahelper/source/vbahelper/vbalineformat.cxx
index aa56903264f5..5437d030c777 100644
--- a/vbahelper/source/vbahelper/vbalineformat.cxx
+++ b/vbahelper/source/vbahelper/vbalineformat.cxx
@@ -81,15 +81,15 @@ ScVbaLineFormat::convertArrowheadStyleToLineStartEndName(
sal_Int32 nArrowheadSt
case office::MsoArrowheadStyle::msoArrowheadNone:
return OUString();
case office::MsoArrowheadStyle::msoArrowheadStealth:
- return OUString("Arrow concave");
+ return "Arrow concave";
case office::MsoArrowheadStyle::msoArrowheadOpen:
- return OUString("Line Arrow");
+ return "Line Arrow";
case office::MsoArrowheadStyle::msoArrowheadOval:
- return OUString("Circle");
+ return "Circle";
case office::MsoArrowheadStyle::msoArrowheadDiamond:
- return OUString("Square 45");
+ return "Square 45";
case office::MsoArrowheadStyle::msoArrowheadTriangle:
- return OUString("Arrow");
+ return "Arrow";
default:
throw uno::RuntimeException( "Invalid Arrow Style!" );
}
@@ -427,7 +427,7 @@ ScVbaLineFormat::ForeColor()
OUString
ScVbaLineFormat::getServiceImplName()
{
- return OUString("ScVbaLineFormat");
+ return "ScVbaLineFormat";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx
b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 9ace2fb60a79..8e3578f1d35c 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
@@ -118,7 +118,7 @@ ScVbaPictureFormat::IncrementContrast( double increment )
OUString
ScVbaPictureFormat::getServiceImplName()
{
- return OUString("ScVbaPictureFormat");
+ return "ScVbaPictureFormat";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbashape.cxx
b/vbahelper/source/vbahelper/vbashape.cxx
index 8fe5eec3428b..2dd9cdbda000 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -742,7 +742,7 @@ ScVbaShape::WrapFormat()
OUString
ScVbaShape::getServiceImplName()
{
- return OUString("ScVbaShape");
+ return "ScVbaShape";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx
b/vbahelper/source/vbahelper/vbashaperange.cxx
index e75aff14b0ff..b21c24165cf7 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -400,7 +400,7 @@ ScVbaShapeRange:: createCollectionObject( const
css::uno::Any& aSource )
OUString
ScVbaShapeRange::getServiceImplName()
{
- return OUString("ScVbaShapeRange");
+ return "ScVbaShapeRange";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx
b/vbahelper/source/vbahelper/vbashapes.cxx
index 52b5f4e5ec5b..d993d443ea5e 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -120,7 +120,7 @@ ScVbaShapes::getElementType()
OUString
ScVbaShapes::getServiceImplName()
{
- return OUString("ScVbaShapes");
+ return "ScVbaShapes";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx
b/vbahelper/source/vbahelper/vbatextframe.cxx
index 8f6ba54492a8..a55c895376ec 100644
--- a/vbahelper/source/vbahelper/vbatextframe.cxx
+++ b/vbahelper/source/vbahelper/vbatextframe.cxx
@@ -141,7 +141,7 @@ VbaTextFrame::Characters()
OUString
VbaTextFrame::getServiceImplName()
{
- return OUString("VbaTextFrame");
+ return "VbaTextFrame";
}
uno::Sequence< OUString >
diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx
b/vbahelper/source/vbahelper/vbawindowbase.cxx
index 46b08bced666..3e86fe0399ea 100644
--- a/vbahelper/source/vbahelper/vbawindowbase.cxx
+++ b/vbahelper/source/vbahelper/vbawindowbase.cxx
@@ -132,7 +132,7 @@ VbaWindowBase::setWidth( sal_Int32 _width )
OUString
VbaWindowBase::getServiceImplName()
{
- return OUString("VbaWindowBase");
+ return "VbaWindowBase";
}
uno::Sequence< OUString >
commit 7680623292f272cf1a8cceb4abb5a67bb5469918
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 30 17:45:37 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 31 12:52:33 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): vcl
Change-Id: I0bd1d26f6fc4052b812fde33ebd1d63111426942
Reviewed-on: https://gerrit.libreoffice.org/76627
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index a9717167c5b7..5ac470b3eb0a 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -203,7 +203,7 @@ public:
virtual void updateMainThread() {}
/// get information about underlying versions
- virtual OUString getOSVersion() { return OUString("-"); }
+ virtual OUString getOSVersion() { return "-"; }
virtual const cairo_font_options_t* GetCairoFontOptions() { return
nullptr; }
diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index 9757eab27837..6ee5eedb6414 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -803,24 +803,24 @@ namespace
OUString lcl_convertFontWeight(double fontWeight)
{
if (fontWeight == awt::FontWeight::THIN || fontWeight ==
awt::FontWeight::ULTRALIGHT)
- return OUString("100");
+ return "100";
if (fontWeight == awt::FontWeight::LIGHT)
- return OUString("200");
+ return "200";
if (fontWeight == awt::FontWeight::SEMILIGHT)
- return OUString("300");
+ return "300";
if (fontWeight == awt::FontWeight::NORMAL)
- return OUString("normal");
+ return "normal";
if (fontWeight == awt::FontWeight::SEMIBOLD)
- return OUString("500");
+ return "500";
if (fontWeight == awt::FontWeight::BOLD)
- return OUString("bold");
+ return "bold";
if (fontWeight == awt::FontWeight::ULTRABOLD)
- return OUString("800");
+ return "800";
if (fontWeight == awt::FontWeight::BLACK)
- return OUString("900");
+ return "900";
// awt::FontWeight::DONTKNOW || fontWeight == awt::FontWeight::NORMAL
- return OUString("normal");
+ return "normal";
}
}
diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index 4b948ae3be17..db018c82150f 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -150,10 +150,7 @@ void Qt5Clipboard::handleChanged(QClipboard::Mode aMode)
listener->changedContents(aEv);
}
-OUString Qt5Clipboard::getImplementationName()
-{
- return OUString("com.sun.star.datatransfer.Qt5Clipboard");
-}
+OUString Qt5Clipboard::getImplementationName() { return
"com.sun.star.datatransfer.Qt5Clipboard"; }
css::uno::Sequence<OUString> Qt5Clipboard::getSupportedServiceNames()
{
diff --git a/vcl/qt5/Qt5DragAndDrop.cxx b/vcl/qt5/Qt5DragAndDrop.cxx
index 118939cdae8f..2b674e5a8e4f 100644
--- a/vcl/qt5/Qt5DragAndDrop.cxx
+++ b/vcl/qt5/Qt5DragAndDrop.cxx
@@ -110,7 +110,7 @@ void Qt5DragSource::fire_dragEnd(sal_Int8 nAction)
OUString SAL_CALL Qt5DragSource::getImplementationName()
{
- return OUString("com.sun.star.datatransfer.dnd.VclQt5DragSource");
+ return "com.sun.star.datatransfer.dnd.VclQt5DragSource";
}
sal_Bool SAL_CALL Qt5DragSource::supportsService(OUString const& ServiceName)
@@ -134,7 +134,7 @@ Qt5DropTarget::Qt5DropTarget()
OUString SAL_CALL Qt5DropTarget::getImplementationName()
{
- return OUString("com.sun.star.datatransfer.dnd.VclQt5DropTarget");
+ return "com.sun.star.datatransfer.dnd.VclQt5DropTarget";
}
sal_Bool SAL_CALL Qt5DropTarget::supportsService(OUString const& ServiceName)
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 63b3ff79a2bc..f499c2db53dd 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -826,7 +826,7 @@ void Qt5FilePicker::disposing(const lang::EventObject&
rEvent)
OUString SAL_CALL Qt5FilePicker::getImplementationName()
{
- return OUString("com.sun.star.ui.dialogs.Qt5FilePicker");
+ return "com.sun.star.ui.dialogs.Qt5FilePicker";
}
sal_Bool SAL_CALL Qt5FilePicker::supportsService(const OUString& ServiceName)
diff --git a/vcl/source/app/IconThemeSelector.cxx
b/vcl/source/app/IconThemeSelector.cxx
index bf3953b755ba..6eec4a52b777 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -53,7 +53,7 @@ IconThemeSelector::IconThemeSelector()
IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString&
desktopEnvironment)
{
if (comphelper::LibreOfficeKit::isActive())
- return OUString("colibre");
+ return "colibre";
#ifdef _WIN32
(void)desktopEnvironment;
@@ -94,7 +94,7 @@ IconThemeSelector::SelectIconThemeForDesktopEnvironment(
}
//if a dark variant is preferred, and we didn't have an exact match,
then try our one and only dark theme
if (mPreferDarkIconTheme &&
icon_theme_is_in_installed_themes("breeze_dark", installedThemes)) {
- return OUString("breeze_dark");
+ return "breeze_dark";
}
}
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index c96d179cf90e..faa717702326 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -389,7 +389,7 @@ OUString vcl_session_getImplementationName()
{
SAL_INFO("vcl.se", "vcl_session_getImplementationName");
- return OUString( "com.sun.star.frame.VCLSessionManagerClient" );
+ return "com.sun.star.frame.VCLSessionManagerClient";
}
Sequence< OUString > vcl_session_getSupportedServiceNames()
diff --git a/vcl/source/components/dtranscomp.cxx
b/vcl/source/components/dtranscomp.cxx
index 2b81c889a52c..5a2f146cca6c 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -111,7 +111,7 @@ Sequence< OUString >
GenericClipboard::getSupportedServiceNames_static()
OUString GenericClipboard::getImplementationName()
{
- return OUString("com.sun.star.datatransfer.VCLGenericClipboard");
+ return "com.sun.star.datatransfer.VCLGenericClipboard";
}
Sequence< OUString > GenericClipboard::getSupportedServiceNames()
@@ -155,7 +155,7 @@ void GenericClipboard::setContents(
OUString GenericClipboard::getName()
{
- return OUString( "CLIPBOARD" );
+ return "CLIPBOARD";
}
sal_Int8 GenericClipboard::getRenderingCapabilities()
@@ -213,7 +213,7 @@ Reference< XInterface >
ClipboardFactory::createInstanceWithArguments( const Seq
OUString Clipboard_getImplementationName()
{
- return OUString(
+ return
#if defined MACOSX
"com.sun.star.datatransfer.clipboard.AquaClipboard"
#elif defined IOS
@@ -225,7 +225,7 @@ OUString Clipboard_getImplementationName()
#else
"com.sun.star.datatransfer.VCLGenericClipboard"
#endif
- );
+ ;
}
Reference< XSingleServiceFactory > Clipboard_createFactory()
@@ -260,7 +260,7 @@ public:
virtual void SAL_CALL initialize( const Sequence< Any >& arguments
) override;
OUString SAL_CALL getImplementationName() override
- { return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource"); }
+ { return "com.sun.star.datatransfer.dnd.VclGenericDragSource"; }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
@@ -317,7 +317,7 @@ OUString DragSource_getImplementationName()
#if defined MACOSX
return OUString("com.sun.star.comp.datatransfer.dnd.OleDragSource_V1");
#elif defined UNX
- return OUString("com.sun.star.datatransfer.dnd.XdndSupport");
+ return "com.sun.star.datatransfer.dnd.XdndSupport";
#else
return OUString("com.sun.star.datatransfer.dnd.VclGenericDragSource");
#endif
@@ -357,7 +357,7 @@ public:
virtual void SAL_CALL setDefaultActions( sal_Int8 actions )
override;
OUString SAL_CALL getImplementationName() override
- { return OUString("com.sun.star.datatransfer.dnd.VclGenericDropTarget"); }
+ { return "com.sun.star.datatransfer.dnd.VclGenericDropTarget"; }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
@@ -415,7 +415,7 @@ Sequence< OUString > DropTarget_getSupportedServiceNames()
OUString DropTarget_getImplementationName()
{
- return OUString(
+ return
#if defined MACOSX
"com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1"
#elif defined UNX
@@ -423,7 +423,7 @@ OUString DropTarget_getImplementationName()
#else
"com.sun.star.datatransfer.dnd.VclGenericDropTarget"
#endif
- );
+ ;
}
Reference< XInterface > DropTarget_createInstance( const Reference<
XMultiServiceFactory >& )
diff --git a/vcl/source/components/fontident.cxx
b/vcl/source/components/fontident.cxx
index e6d5202ef80e..2da25d18eb63 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -151,7 +151,7 @@ Sequence< OUString >
FontIdentificator_getSupportedServiceNames()
OUString FontIdentificator_getImplementationName()
{
- return OUString( "vcl::FontIdentificator" );
+ return "vcl::FontIdentificator";
}
Reference< XInterface > FontIdentificator_createInstance( const Reference<
XMultiServiceFactory >& )
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index d35b3c51c727..373be2a0cd34 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -985,7 +985,7 @@ static sal_uInt16 ImplCutMonthFromString( OUString& rStr,
const CalendarWrapper&
static OUString ImplGetDateSep( const LocaleDataWrapper& rLocaleDataWrapper,
ExtDateFieldFormat eFormat )
{
if ( ( eFormat == ExtDateFieldFormat::ShortYYMMDD_DIN5008 ) || ( eFormat
== ExtDateFieldFormat::ShortYYYYMMDD_DIN5008 ) )
- return OUString("-");
+ return "-";
else
return rLocaleDataWrapper.getDateSep();
}
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx
index 604092a2a8a7..c5d2dfaa4c6c 100644
--- a/vcl/source/gdi/mtfxmldump.cxx
+++ b/vcl/source/gdi/mtfxmldump.cxx
@@ -23,11 +23,11 @@ namespace
OUString collectPushFlags(PushFlags nFlags)
{
if ((nFlags & PushFlags::ALL) == PushFlags::ALL)
- return OUString("PushAll");
+ return "PushAll";
else if ((nFlags & PUSH_ALLFONT) == PUSH_ALLFONT)
- return OUString("PushAllFont");
+ return "PushAllFont";
else if ((nFlags & PUSH_ALLTEXT) == PUSH_ALLTEXT)
- return OUString("PushAllText");
+ return "PushAllText";
std::vector<OUString> aStrings;
@@ -116,7 +116,7 @@ OUString convertDrawTextFlagsToString(DrawTextFlags
eDrawTextFlags)
OUString aString;
if (aStrings.empty())
- return OUString("None");
+ return "None";
aString = aStrings[0];
for (size_t i = 1; i < aStrings.size(); ++i)
@@ -130,11 +130,11 @@ OUString convertRopToString(RasterOp eRop)
{
switch (eRop)
{
- case RasterOp::OverPaint: return OUString("overpaint");
- case RasterOp::Xor: return OUString("xor");
- case RasterOp::N0: return OUString("0");
- case RasterOp::N1: return OUString("1");
- case RasterOp::Invert: return OUString("invert");
+ case RasterOp::OverPaint: return "overpaint";
+ case RasterOp::Xor: return "xor";
+ case RasterOp::N0: return "0";
+ case RasterOp::N1: return "1";
+ case RasterOp::Invert: return "invert";
}
return OUString();
}
@@ -143,10 +143,10 @@ OUString convertTextAlignToString(TextAlign eAlign)
{
switch (eAlign)
{
- case ALIGN_BASELINE: return OUString("baseline");
- case ALIGN_BOTTOM: return OUString("bottom");
- case ALIGN_TOP: return OUString("top");
- case TextAlign_FORCE_EQUAL_SIZE: return OUString("equalsize");
+ case ALIGN_BASELINE: return "baseline";
+ case ALIGN_BOTTOM: return "bottom";
+ case ALIGN_TOP: return "top";
+ case TextAlign_FORCE_EQUAL_SIZE: return "equalsize";
}
return OUString();
}
@@ -161,9 +161,9 @@ OUString convertLineStyleToString(LineStyle eAlign)
{
switch (eAlign)
{
- case LineStyle::NONE: return OUString("none");
- case LineStyle::Solid: return OUString("solid");
- case LineStyle::Dash: return OUString("dash");
+ case LineStyle::NONE: return "none";
+ case LineStyle::Solid: return "solid";
+ case LineStyle::Dash: return "dash";
default: break;
}
return OUString();
@@ -174,10 +174,10 @@ OUString convertLineJoinToString(basegfx::B2DLineJoin
eJoin)
switch (eJoin)
{
default:
- case basegfx::B2DLineJoin::NONE: return OUString("none");
- case basegfx::B2DLineJoin::Bevel: return OUString("bevel");
- case basegfx::B2DLineJoin::Miter: return OUString("miter");
- case basegfx::B2DLineJoin::Round: return OUString("round");
+ case basegfx::B2DLineJoin::NONE: return "none";
+ case basegfx::B2DLineJoin::Bevel: return "bevel";
+ case basegfx::B2DLineJoin::Miter: return "miter";
+ case basegfx::B2DLineJoin::Round: return "round";
}
}
@@ -186,9 +186,9 @@ OUString convertLineCapToString(css::drawing::LineCap eCap)
switch (eCap)
{
default:
- case css::drawing::LineCap_BUTT: return OUString("butt");
- case css::drawing::LineCap_ROUND: return OUString("round");
- case css::drawing::LineCap_SQUARE: return OUString("square");
+ case css::drawing::LineCap_BUTT: return "butt";
+ case css::drawing::LineCap_ROUND: return "round";
+ case css::drawing::LineCap_SQUARE: return "square";
}
}
@@ -197,10 +197,10 @@ OUString convertPolygonFlags(PolyFlags eFlags)
switch (eFlags)
{
default:
- case PolyFlags::Normal: return OUString("normal");
- case PolyFlags::Control: return OUString("control");
- case PolyFlags::Smooth: return OUString("smooth");
- case PolyFlags::Symmetric: return OUString("symmetric");
+ case PolyFlags::Normal: return "normal";
+ case PolyFlags::Control: return "control";
+ case PolyFlags::Smooth: return "smooth";
+ case PolyFlags::Symmetric: return "symmetric";
}
}
@@ -208,18 +208,18 @@ OUString convertFontWeigthToString(FontWeight eFontWeight)
{
switch (eFontWeight)
{
- case WEIGHT_DONTKNOW: return OUString("unknown");
- case WEIGHT_THIN: return OUString("thin");
- case WEIGHT_ULTRALIGHT: return OUString("ultralight");
- case WEIGHT_LIGHT: return OUString("light");
- case WEIGHT_SEMILIGHT: return OUString("semilight");
- case WEIGHT_NORMAL: return OUString("normal");
- case WEIGHT_MEDIUM: return OUString("medium");
- case WEIGHT_SEMIBOLD: return OUString("semibold");
- case WEIGHT_BOLD: return OUString("bold");
- case WEIGHT_ULTRABOLD: return OUString("ultrabold");
- case WEIGHT_BLACK: return OUString("black");
- case FontWeight_FORCE_EQUAL_SIZE: return OUString("equalsize");
+ case WEIGHT_DONTKNOW: return "unknown";
+ case WEIGHT_THIN: return "thin";
+ case WEIGHT_ULTRALIGHT: return "ultralight";
+ case WEIGHT_LIGHT: return "light";
+ case WEIGHT_SEMILIGHT: return "semilight";
+ case WEIGHT_NORMAL: return "normal";
+ case WEIGHT_MEDIUM: return "medium";
+ case WEIGHT_SEMIBOLD: return "semibold";
+ case WEIGHT_BOLD: return "bold";
+ case WEIGHT_ULTRABOLD: return "ultrabold";
+ case WEIGHT_BLACK: return "black";
+ case FontWeight_FORCE_EQUAL_SIZE: return "equalsize";
}
return OUString();
}
@@ -228,14 +228,14 @@ OUString convertFontStrikeoutToString(FontStrikeout
eFontStrikeout)
{
switch (eFontStrikeout)
{
- case STRIKEOUT_NONE: return OUString("none");
- case STRIKEOUT_SINGLE: return OUString("single");
- case STRIKEOUT_DOUBLE: return OUString("double");
- case STRIKEOUT_DONTKNOW: return OUString("dontknow");
- case STRIKEOUT_BOLD: return OUString("bold");
- case STRIKEOUT_SLASH: return OUString("slash");
- case STRIKEOUT_X: return OUString("x");
- case FontStrikeout_FORCE_EQUAL_SIZE: return OUString("equalsize");
+ case STRIKEOUT_NONE: return "none";
+ case STRIKEOUT_SINGLE: return "single";
+ case STRIKEOUT_DOUBLE: return "double";
+ case STRIKEOUT_DONTKNOW: return "dontknow";
+ case STRIKEOUT_BOLD: return "bold";
+ case STRIKEOUT_SLASH: return "slash";
+ case STRIKEOUT_X: return "x";
+ case FontStrikeout_FORCE_EQUAL_SIZE: return "equalsize";
}
return OUString();
}
@@ -244,26 +244,26 @@ OUString convertFontLineStyleToString(FontLineStyle
eFontLineStyle)
{
switch (eFontLineStyle)
{
- case LINESTYLE_NONE: return OUString("none");
- case LINESTYLE_SINGLE: return OUString("single");
- case LINESTYLE_DOUBLE: return OUString("double");
- case LINESTYLE_DOTTED: return OUString("dotted");
- case LINESTYLE_DONTKNOW: return OUString("dontknow");
- case LINESTYLE_DASH: return OUString("dash");
- case LINESTYLE_LONGDASH: return OUString("longdash");
- case LINESTYLE_DASHDOT: return OUString("dashdot");
- case LINESTYLE_DASHDOTDOT: return OUString("dashdotdot");
- case LINESTYLE_SMALLWAVE: return OUString("smallwave");
- case LINESTYLE_WAVE: return OUString("wave");
- case LINESTYLE_DOUBLEWAVE: return OUString("doublewave");
- case LINESTYLE_BOLD: return OUString("bold");
- case LINESTYLE_BOLDDOTTED: return OUString("bolddotted");
- case LINESTYLE_BOLDDASH: return OUString("bolddash");
- case LINESTYLE_BOLDLONGDASH: return OUString("boldlongdash");
- case LINESTYLE_BOLDDASHDOT: return OUString("bolddashdot");
- case LINESTYLE_BOLDDASHDOTDOT: return OUString("bolddashdotdot");
- case LINESTYLE_BOLDWAVE: return OUString("boldwave");
- case FontLineStyle_FORCE_EQUAL_SIZE: return OUString("equalsize");
+ case LINESTYLE_NONE: return "none";
+ case LINESTYLE_SINGLE: return "single";
+ case LINESTYLE_DOUBLE: return "double";
+ case LINESTYLE_DOTTED: return "dotted";
+ case LINESTYLE_DONTKNOW: return "dontknow";
+ case LINESTYLE_DASH: return "dash";
+ case LINESTYLE_LONGDASH: return "longdash";
+ case LINESTYLE_DASHDOT: return "dashdot";
+ case LINESTYLE_DASHDOTDOT: return "dashdotdot";
+ case LINESTYLE_SMALLWAVE: return "smallwave";
+ case LINESTYLE_WAVE: return "wave";
+ case LINESTYLE_DOUBLEWAVE: return "doublewave";
+ case LINESTYLE_BOLD: return "bold";
+ case LINESTYLE_BOLDDOTTED: return "bolddotted";
+ case LINESTYLE_BOLDDASH: return "bolddash";
+ case LINESTYLE_BOLDLONGDASH: return "boldlongdash";
+ case LINESTYLE_BOLDDASHDOT: return "bolddashdot";
+ case LINESTYLE_BOLDDASHDOTDOT: return "bolddashdotdot";
+ case LINESTYLE_BOLDWAVE: return "boldwave";
+ case FontLineStyle_FORCE_EQUAL_SIZE: return "equalsize";
}
return OUString();
}
@@ -335,9 +335,9 @@ OUString convertBitmapExTransparentType(TransparentType
eType)
switch (eType)
{
default:
- case TransparentType::NONE: return OUString("none");
- case TransparentType::Bitmap: return OUString("bitmap");
- case TransparentType::Color: return OUString("color");
+ case TransparentType::NONE: return "none";
+ case TransparentType::Bitmap: return "bitmap";
+ case TransparentType::Color: return "color";
}
}
@@ -346,21 +346,21 @@ OUString convertMapUnitToString(MapUnit eUnit)
switch (eUnit)
{
default:
- case MapUnit::LASTENUMDUMMY: return OUString("LASTENUMDUMMY");
- case MapUnit::Map1000thInch: return OUString("Map1000thInch");
- case MapUnit::Map100thInch: return OUString("Map100thInch");
- case MapUnit::Map100thMM: return OUString("Map100thMM");
- case MapUnit::Map10thInch: return OUString("Map10thInch");
- case MapUnit::Map10thMM: return OUString("Map10thMM");
- case MapUnit::MapAppFont: return OUString("MapAppFont");
- case MapUnit::MapCM: return OUString("MapCM");
- case MapUnit::MapInch: return OUString("MapInch");
- case MapUnit::MapMM: return OUString("MapMM");
- case MapUnit::MapPixel: return OUString("MapPixel");
- case MapUnit::MapPoint: return OUString("MapPoint");
- case MapUnit::MapRelative: return OUString("MapRelative");
- case MapUnit::MapSysFont: return OUString("MapSysFont");
- case MapUnit::MapTwip: return OUString("MapTwip");
+ case MapUnit::LASTENUMDUMMY: return "LASTENUMDUMMY";
+ case MapUnit::Map1000thInch: return "Map1000thInch";
+ case MapUnit::Map100thInch: return "Map100thInch";
+ case MapUnit::Map100thMM: return "Map100thMM";
+ case MapUnit::Map10thInch: return "Map10thInch";
+ case MapUnit::Map10thMM: return "Map10thMM";
+ case MapUnit::MapAppFont: return "MapAppFont";
+ case MapUnit::MapCM: return "MapCM";
+ case MapUnit::MapInch: return "MapInch";
+ case MapUnit::MapMM: return "MapMM";
+ case MapUnit::MapPixel: return "MapPixel";
+ case MapUnit::MapPoint: return "MapPoint";
+ case MapUnit::MapRelative: return "MapRelative";
+ case MapUnit::MapSysFont: return "MapSysFont";
+ case MapUnit::MapTwip: return "MapTwip";
}
}
@@ -377,13 +377,13 @@ OUString convertGradientStyle(GradientStyle eStyle)
{
switch (eStyle)
{
- case GradientStyle::Linear: return OUString("Linear");
- case GradientStyle::Axial: return OUString("Axial");
- case GradientStyle::Radial: return OUString("Radial");
- case GradientStyle::Elliptical: return OUString("Elliptical");
- case GradientStyle::Square: return OUString("Square");
- case GradientStyle::Rect: return OUString("Rect");
- case GradientStyle::FORCE_EQUAL_SIZE: return
OUString("ForceEqualSize");
+ case GradientStyle::Linear: return "Linear";
+ case GradientStyle::Axial: return "Axial";
+ case GradientStyle::Radial: return "Radial";
+ case GradientStyle::Elliptical: return "Elliptical";
+ case GradientStyle::Square: return "Square";
+ case GradientStyle::Rect: return "Rect";
+ case GradientStyle::FORCE_EQUAL_SIZE: return "ForceEqualSize";
}
return OUString();
}
@@ -392,10 +392,10 @@ OUString convertHatchStyle(HatchStyle eStyle)
{
switch (eStyle)
{
- case HatchStyle::Single: return OUString("Single");
- case HatchStyle::Double: return OUString("Double");
- case HatchStyle::Triple: return OUString("Triple");
- case HatchStyle::FORCE_EQUAL_SIZE: return OUString("ForceEqualSize");
+ case HatchStyle::Single: return "Single";
+ case HatchStyle::Double: return "Double";
+ case HatchStyle::Triple: return "Triple";
+ case HatchStyle::FORCE_EQUAL_SIZE: return "ForceEqualSize";
}
return OUString();
}
@@ -404,19 +404,19 @@ OUString convertWallpaperStyleToString(WallpaperStyle
eWallpaperStyle)
{
switch (eWallpaperStyle)
{
- case WallpaperStyle::NONE: return OUString("NONE");
- case WallpaperStyle::Tile: return OUString("Tile");
- case WallpaperStyle::Center: return OUString("Center");
- case WallpaperStyle::Scale: return OUString("Scale");
- case WallpaperStyle::TopLeft: return OUString("TopLeft");
- case WallpaperStyle::Top: return OUString("Top");
- case WallpaperStyle::TopRight: return OUString("TopRight");
- case WallpaperStyle::Left: return OUString("Left");
- case WallpaperStyle::Right: return OUString("Right");
- case WallpaperStyle::BottomLeft: return OUString("BottomLeft");
- case WallpaperStyle::Bottom: return OUString("Bottom");
- case WallpaperStyle::BottomRight: return OUString("BottomRight");
- case WallpaperStyle::ApplicationGradient: return
OUString("ApplicationGradient");
+ case WallpaperStyle::NONE: return "NONE";
+ case WallpaperStyle::Tile: return "Tile";
+ case WallpaperStyle::Center: return "Center";
+ case WallpaperStyle::Scale: return "Scale";
+ case WallpaperStyle::TopLeft: return "TopLeft";
+ case WallpaperStyle::Top: return "Top";
+ case WallpaperStyle::TopRight: return "TopRight";
+ case WallpaperStyle::Left: return "Left";
+ case WallpaperStyle::Right: return "Right";
+ case WallpaperStyle::BottomLeft: return "BottomLeft";
+ case WallpaperStyle::Bottom: return "Bottom";
+ case WallpaperStyle::BottomRight: return "BottomRight";
+ case WallpaperStyle::ApplicationGradient: return "ApplicationGradient";
}
return OUString();
}
diff --git a/vcl/source/graphic/UnoGraphic.cxx
b/vcl/source/graphic/UnoGraphic.cxx
index b13860caa734..f546389663b1 100644
--- a/vcl/source/graphic/UnoGraphic.cxx
+++ b/vcl/source/graphic/UnoGraphic.cxx
@@ -85,7 +85,7 @@ void SAL_CALL Graphic::release() throw()
OUString SAL_CALL Graphic::getImplementationName()
{
- return OUString( "com.sun.star.comp.graphic.Graphic" );
+ return "com.sun.star.comp.graphic.Graphic";
}
sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName )
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx
b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index 331e24167aff..9db06af2a4cb 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -192,7 +192,7 @@ void SAL_CALL GraphicDescriptor::release()
OUString SAL_CALL GraphicDescriptor::getImplementationName()
{
- return OUString( "com.sun.star.comp.graphic.GraphicDescriptor" );
+ return "com.sun.star.comp.graphic.GraphicDescriptor";
}
sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString&
ServiceName )
diff --git a/vcl/source/graphic/UnoGraphicObject.cxx
b/vcl/source/graphic/UnoGraphicObject.cxx
index 86bb100ed3f2..bab6bffe5beb 100644
--- a/vcl/source/graphic/UnoGraphicObject.cxx
+++ b/vcl/source/graphic/UnoGraphicObject.cxx
@@ -49,7 +49,7 @@ public:
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.graphic.GraphicObject");
+ return "com.sun.star.graphic.GraphicObject";
}
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
override
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx
b/vcl/source/graphic/UnoGraphicProvider.cxx
index 907b81316050..2ab3b2f38b99 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -90,7 +90,7 @@ GraphicProvider::GraphicProvider()
OUString SAL_CALL GraphicProvider::getImplementationName()
{
- return OUString( "com.sun.star.comp.graphic.GraphicProvider" );
+ return "com.sun.star.comp.graphic.GraphicProvider";
}
sal_Bool SAL_CALL GraphicProvider::supportsService( const OUString&
ServiceName )
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index bd5db6adb438..1153c6b520cf 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -197,7 +197,7 @@ OString GetCommandLineToken(int nToken, const OString&
rLine)
*pLeap = 0;
- return OString(pBuffer);
+ return pBuffer;
}
int GetCommandLineTokenCount(const OUString& rLine)
@@ -362,7 +362,7 @@ OString WhitespaceToSpace(const OString& rLine)
if( *pLeap == ' ' )
*pLeap = 0;
- return OString(*pBuffer == ' ' ? pBuffer+1 : pBuffer);
+ return *pBuffer == ' ' ? pBuffer+1 : pBuffer;
}
} // namespace
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 16fb939290b4..89f2c28805c6 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -79,7 +79,7 @@ OString loadShader(const OUString& rFilename)
assert(nSize == nBytesRead);
content.get()[nBytesRead] = 0;
SAL_INFO("vcl.opengl", "Read " << nBytesRead << " bytes from " <<
aFileURL);
- return OString(content.get());
+ return content.get();
}
else
{
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 3f7d7c5a655c..a33c719f86ee 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -257,7 +257,7 @@ void SAL_CALL
TransferableHelper::TerminateListener::notifyTermination( const Ev
OUString SAL_CALL
TransferableHelper::TerminateListener::getImplementationName()
{
- return
OUString("com.sun.star.comp.svt.TransferableHelperTerminateListener");
+ return "com.sun.star.comp.svt.TransferableHelperTerminateListener";
}
sal_Bool SAL_CALL TransferableHelper::TerminateListener::supportsService(const
OUString& /*rServiceName*/)
diff --git a/vcl/source/treelist/uiobject.cxx b/vcl/source/treelist/uiobject.cxx
index 9b3d62dfcdfc..e5f166e8f1ce 100644
--- a/vcl/source/treelist/uiobject.cxx
+++ b/vcl/source/treelist/uiobject.cxx
@@ -83,7 +83,7 @@ std::set<OUString> TreeListUIObject::get_children() const
OUString TreeListUIObject::get_name() const
{
- return OUString("TreeListUIObject");
+ return "TreeListUIObject";
}
std::unique_ptr<UIObject> TreeListUIObject::create(vcl::Window* pWindow)
@@ -167,7 +167,7 @@ std::set<OUString> TreeListEntryUIObject::get_children()
const
OUString TreeListEntryUIObject::get_type() const
{
- return OUString("TreeListEntry");
+ return "TreeListEntry";
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index d100d1bbf125..7860364da9d9 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -223,7 +223,7 @@ namespace {
OUString StringMapToOUString(const std::map<OUString, OUString>& rParameters)
{
if (rParameters.empty())
- return OUString("");
+ return "";
OUStringBuffer aParameterString = " {";
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index b8932913cf53..aa69bd0d60b6 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -49,7 +49,7 @@ void UIObject::execute(const OUString& /*rAction*/,
OUString UIObject::get_type() const
{
- return OUString("Generic UIObject");
+ return "Generic UIObject";
}
std::unique_ptr<UIObject> UIObject::get_child(const OUString&)
@@ -450,7 +450,7 @@ std::set<OUString> WindowUIObject::get_children() const
OUString WindowUIObject::get_name() const
{
- return OUString("WindowUIObject");
+ return "WindowUIObject";
}
namespace {
@@ -577,7 +577,7 @@ void ButtonUIObject::execute(const OUString& rAction,
OUString ButtonUIObject::get_name() const
{
- return OUString("ButtonUIObject");
+ return "ButtonUIObject";
}
OUString ButtonUIObject::get_action(VclEventId nEvent) const
@@ -618,7 +618,7 @@ StringMap DialogUIObject::get_state()
OUString DialogUIObject::get_name() const
{
- return OUString("DialogUIObject");
+ return "DialogUIObject";
}
std::unique_ptr<UIObject> DialogUIObject::create(vcl::Window* pWindow)
@@ -720,7 +720,7 @@ OUString EditUIObject::get_action(VclEventId nEvent) const
OUString EditUIObject::get_name() const
{
- return OUString("EditUIObject");
+ return "EditUIObject";
}
std::unique_ptr<UIObject> EditUIObject::create(vcl::Window* pWindow)
@@ -781,7 +781,7 @@ StringMap MultiLineEditUIObject::get_state()
OUString MultiLineEditUIObject::get_name() const
{
- return OUString("MultiLineEditUIObject");
+ return "MultiLineEditUIObject";
}
std::unique_ptr<UIObject> MultiLineEditUIObject::create(vcl::Window* pWindow)
@@ -821,7 +821,7 @@ StringMap CheckBoxUIObject::get_state()
OUString CheckBoxUIObject::get_name() const
{
- return OUString("CheckBoxUIObject");
+ return "CheckBoxUIObject";
}
OUString CheckBoxUIObject::get_action(VclEventId nEvent) const
@@ -871,7 +871,7 @@ StringMap RadioButtonUIObject::get_state()
OUString RadioButtonUIObject::get_name() const
{
- return OUString("RadioButtonUIObject");
+ return "RadioButtonUIObject";
}
OUString RadioButtonUIObject::get_action(VclEventId nEvent) const
@@ -920,7 +920,7 @@ StringMap TabPageUIObject::get_state()
OUString TabPageUIObject::get_name() const
{
- return OUString("TabPageUIObject");
+ return "TabPageUIObject";
}
ListBoxUIObject::ListBoxUIObject(const VclPtr<ListBox>& xListBox):
@@ -976,7 +976,7 @@ StringMap ListBoxUIObject::get_state()
OUString ListBoxUIObject::get_name() const
{
- return OUString("ListBoxUIObject");
+ return "ListBoxUIObject";
}
OUString ListBoxUIObject::get_action(VclEventId nEvent) const
@@ -1052,7 +1052,7 @@ StringMap ComboBoxUIObject::get_state()
OUString ComboBoxUIObject::get_name() const
{
- return OUString("ComboBoxUIObject");
+ return "ComboBoxUIObject";
}
OUString ComboBoxUIObject::get_action(VclEventId nEvent) const
@@ -1128,7 +1128,7 @@ OUString SpinUIObject::get_action(VclEventId nEvent) const
OUString SpinUIObject::get_name() const
{
- return OUString("SpinUIObject");
+ return "SpinUIObject";
}
SpinFieldUIObject::SpinFieldUIObject(const VclPtr<SpinField>& xSpinField):
@@ -1190,7 +1190,7 @@ OUString SpinFieldUIObject::get_action(VclEventId nEvent)
const
OUString SpinFieldUIObject::get_name() const
{
- return OUString("SpinFieldUIObject");
+ return "SpinFieldUIObject";
}
std::unique_ptr<UIObject> SpinFieldUIObject::create(vcl::Window* pWindow)
@@ -1254,7 +1254,7 @@ OUString TabControlUIObject::get_action(VclEventId
nEvent) const
OUString TabControlUIObject::get_name() const
{
- return OUString("TabControlUIObject");
+ return "TabControlUIObject";
}
std::unique_ptr<UIObject> TabControlUIObject::create(vcl::Window* pWindow)
diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx
b/vcl/source/uitest/uno/uiobject_uno.cxx
index 283970569a0e..d4a88f7513f6 100644
--- a/vcl/source/uitest/uno/uiobject_uno.cxx
+++ b/vcl/source/uitest/uno/uiobject_uno.cxx
@@ -187,7 +187,7 @@ OUString SAL_CALL UIObjectUnoObj::getType()
OUString SAL_CALL UIObjectUnoObj::getImplementationName()
{
- return OUString("org.libreoffice.uitest.UIObject");
+ return "org.libreoffice.uitest.UIObject";
}
sal_Bool UIObjectUnoObj::supportsService(OUString const & ServiceName)
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx
b/vcl/source/uitest/uno/uitest_uno.cxx
index 69d0c717a9bb..354b30585c69 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -97,7 +97,7 @@ css::uno::Reference<css::ui::test::XUIObject> SAL_CALL
UITestUnoObj::getFloatWin
OUString SAL_CALL UITestUnoObj::getImplementationName()
{
- return OUString("org.libreoffice.uitest.UITest");
+ return "org.libreoffice.uitest.UITest";
}
sal_Bool UITestUnoObj::supportsService(OUString const & ServiceName)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index df3f672d227b..b2eb2c65142c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -79,13 +79,13 @@ namespace
OUString mapStockToImageResource(const OUString& sType)
{
if (sType == "gtk-index")
- return OUString(SV_RESID_BITMAP_INDEX);
+ return SV_RESID_BITMAP_INDEX;
else if (sType == "gtk-refresh")
- return OUString(SV_RESID_BITMAP_REFRESH);
+ return SV_RESID_BITMAP_REFRESH;
else if (sType == "gtk-apply")
- return OUString(IMG_APPLY);
+ return IMG_APPLY;
else if (sType == "gtk-dialog-error")
- return OUString(IMG_ERROR);
+ return IMG_ERROR;
return OUString();
}
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx
b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 0855ebd117ea..c91f3248dd95 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -215,7 +215,7 @@ Reference< XInterface > X11Clipboard::getReference() throw()
OUString SAL_CALL X11Clipboard::getImplementationName( )
{
- return OUString(X11_CLIPBOARD_IMPLEMENTATION_NAME);
+ return X11_CLIPBOARD_IMPLEMENTATION_NAME;
}
sal_Bool SAL_CALL X11Clipboard::supportsService( const OUString& ServiceName )
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx
b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index f9d87e18c071..5e1320fe3107 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -161,7 +161,7 @@ void DropTarget::dragOver( const DropTargetDragEvent& dtde
) throw()
// XServiceInfo
OUString DropTarget::getImplementationName()
{
- return OUString(XDND_DROPTARGET_IMPLEMENTATION_NAME);
+ return XDND_DROPTARGET_IMPLEMENTATION_NAME;
}
sal_Bool DropTarget::supportsService( const OUString& ServiceName )
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 3e0900030027..a6ab25389077 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -4005,7 +4005,7 @@ void SelectionManagerHolder::startDrag(
OUString SelectionManagerHolder::getImplementationName()
{
- return OUString(XDND_IMPLEMENTATION_NAME);
+ return XDND_IMPLEMENTATION_NAME;
}
sal_Bool SelectionManagerHolder::supportsService( const OUString& ServiceName )
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 2d35d3dc96bb..7a97b0f65bf5 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -337,7 +337,7 @@ public:
OUString VclGtkClipboard::getImplementationName()
{
- return OUString("com.sun.star.datatransfer.VclGtkClipboard");
+ return "com.sun.star.datatransfer.VclGtkClipboard";
}
Sequence< OUString > VclGtkClipboard::getSupportedServiceNames()
@@ -730,7 +730,7 @@ GtkDropTarget::GtkDropTarget()
OUString SAL_CALL GtkDropTarget::getImplementationName()
{
- return OUString("com.sun.star.datatransfer.dnd.VclGtkDropTarget");
+ return "com.sun.star.datatransfer.dnd.VclGtkDropTarget";
}
sal_Bool SAL_CALL GtkDropTarget::supportsService(OUString const & ServiceName)
@@ -915,7 +915,7 @@ void GtkDragSource::initialize(const
css::uno::Sequence<css::uno::Any >& rArgume
OUString SAL_CALL GtkDragSource::getImplementationName()
{
- return OUString("com.sun.star.datatransfer.dnd.VclGtkDragSource");
+ return "com.sun.star.datatransfer.dnd.VclGtkDragSource";
}
sal_Bool SAL_CALL GtkDragSource::supportsService(OUString const & ServiceName)
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index adf9ea87d455..8fbd2fc5385b 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -435,10 +435,7 @@ void Gtk3KDE5FilePicker::disposing(const
lang::EventObject& rEvent)
}
}
-OUString SAL_CALL Gtk3KDE5FilePicker::getImplementationName()
-{
- return OUString(FILE_PICKER_IMPL_NAME);
-}
+OUString SAL_CALL Gtk3KDE5FilePicker::getImplementationName() { return
FILE_PICKER_IMPL_NAME; }
sal_Bool SAL_CALL Gtk3KDE5FilePicker::supportsService(const OUString&
ServiceName)
{
diff --git a/vcl/unx/kf5/KF5FilePicker.cxx b/vcl/unx/kf5/KF5FilePicker.cxx
index 9ecbbb7d8feb..451824a12f13 100644
--- a/vcl/unx/kf5/KF5FilePicker.cxx
+++ b/vcl/unx/kf5/KF5FilePicker.cxx
@@ -175,7 +175,7 @@ void KF5FilePicker::addCustomControl(sal_Int16 controlId)
// XServiceInfo
OUString SAL_CALL KF5FilePicker::getImplementationName()
{
- return OUString("com.sun.star.ui.dialogs.KF5FilePicker");
+ return "com.sun.star.ui.dialogs.KF5FilePicker";
}
sal_Bool SAL_CALL KF5FilePicker::supportsService(const OUString& ServiceName)
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 01dc12f24460..f9d0fb965914 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -116,7 +116,7 @@ class DemoRenderer
virtual sal_uInt16 getTestRepeatCount() = 0;
#define RENDER_DETAILS(name,key,repeat) \
virtual OUString getName() override \
- { return OUString(SAL_STRINGIFY(name)); } \
+ { return SAL_STRINGIFY(name); } \
virtual sal_uInt16 getAccelerator() override \
{ return key; } \
virtual sal_uInt16 getTestRepeatCount() override \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
