[Libreoffice-commits] core.git: 6 commits - include/toolkit testtools/source toolkit/source tools/source ucbhelper/source ucb/source unoidl/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 31 10:54:22 UTC 2019
include/toolkit/helper/macros.hxx | 2
testtools/source/bridgetest/bridgetest.cxx | 2
testtools/source/bridgetest/constructors.cxx | 8 -
testtools/source/bridgetest/cppobj.cxx | 2
toolkit/source/awt/asynccallback.cxx | 2
toolkit/source/awt/vclxaccessiblecomponent.cxx | 2
toolkit/source/awt/vclxpointer.cxx | 2
toolkit/source/awt/vclxprinter.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 2
toolkit/source/controls/animatedimages.cxx | 8 -
toolkit/source/controls/controlmodelcontainerbase.cxx | 4
toolkit/source/controls/dialogcontrol.cxx | 24 +--
toolkit/source/controls/formattedcontrol.cxx | 6
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 2
toolkit/source/controls/grid/defaultgriddatamodel.cxx | 2
toolkit/source/controls/grid/gridcolumn.cxx | 2
toolkit/source/controls/grid/gridcontrol.cxx | 4
toolkit/source/controls/grid/gridcontrol.hxx | 4
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2
toolkit/source/controls/roadmapcontrol.cxx | 6
toolkit/source/controls/roadmapentry.cxx | 2
toolkit/source/controls/spinningprogress.cxx | 4
toolkit/source/controls/stdtabcontroller.cxx | 2
toolkit/source/controls/stdtabcontrollermodel.cxx | 2
toolkit/source/controls/tabpagecontainer.cxx | 4
toolkit/source/controls/tabpagemodel.cxx | 8 -
toolkit/source/controls/tkscrollbar.cxx | 6
toolkit/source/controls/tkspinbutton.cxx | 8 -
toolkit/source/controls/tree/treecontrol.cxx | 4
toolkit/source/controls/tree/treecontrol.hxx | 2
toolkit/source/controls/tree/treedatamodel.cxx | 4
toolkit/source/controls/unocontrolcontainer.cxx | 2
toolkit/source/controls/unocontrolcontainermodel.cxx | 2
toolkit/source/controls/unocontrols.cxx | 104 ++++++++--------
tools/source/inet/inetmsg.cxx | 4
tools/source/xml/XmlWalker.cxx | 5
ucb/source/cacher/cachedcontentresultset.cxx | 4
ucb/source/cacher/cachedcontentresultsetstub.cxx | 4
ucb/source/cacher/cacheddynamicresultset.cxx | 4
ucb/source/cacher/cacheddynamicresultsetstub.cxx | 4
ucb/source/core/FileAccess.cxx | 2
ucb/source/core/cmdenv.cxx | 2
ucb/source/core/provprox.cxx | 4
ucb/source/core/ucb.cxx | 2
ucb/source/core/ucbprops.cxx | 2
ucb/source/core/ucbstore.cxx | 6
ucb/source/sorter/sortdynres.cxx | 4
ucb/source/sorter/sortresult.cxx | 2
ucb/source/ucp/cmis/cmis_content.cxx | 2
ucb/source/ucp/cmis/cmis_provider.cxx | 2
ucb/source/ucp/cmis/cmis_repo_content.cxx | 4
ucb/source/ucp/expand/ucpexpand.cxx | 2
ucb/source/ucp/ext/ucpext_content.cxx | 2
ucb/source/ucp/ext/ucpext_provider.cxx | 6
ucb/source/ucp/file/bc.cxx | 2
ucb/source/ucp/file/filtask.cxx | 2
ucb/source/ucp/ftp/ftpcontent.cxx | 4
ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 2
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 2
ucb/source/ucp/gio/gio_content.cxx | 2
ucb/source/ucp/gio/gio_provider.cxx | 2
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 2
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 4
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 2
ucb/source/ucp/image/ucpimage.cxx | 2
ucb/source/ucp/package/pkgcontent.cxx | 2
ucb/source/ucp/package/pkgprovider.cxx | 2
ucb/source/ucp/tdoc/tdoc_content.cxx | 2
ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx | 4
ucb/source/ucp/tdoc/tdoc_provider.cxx | 2
ucb/source/ucp/webdav-neon/NeonUri.cxx | 2
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 6
ucb/source/ucp/webdav-neon/webdavprovider.cxx | 2
ucbhelper/source/provider/resultset.cxx | 2
ucbhelper/source/provider/resultsethelper.cxx | 2
unoidl/source/sourceprovider-parser.y | 52 ++++----
unoidl/source/unoidl-check.cxx | 6
77 files changed, 208 insertions(+), 211 deletions(-)
New commits:
commit cd03cd9158a01d3e2ccf6574d80b68bd4cf994a9
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:47:30 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:53:48 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): testtools
Change-Id: Ia053ced81d0c0546b1047c8bbee6caa4cfb32e41
Reviewed-on: https://gerrit.libreoffice.org/76637
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index ae59820d1be1..66be97682ddf 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -1184,7 +1184,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
OUString TestBridgeImpl::getImplementationName()
{
- return OUString( IMPLNAME );
+ return IMPLNAME;
}
sal_Bool TestBridgeImpl::supportsService( const OUString & rServiceName )
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 03b633a54665..050c2dd6683c 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -413,8 +413,8 @@ css::uno::Reference< css::uno::XInterface > create(
}
OUString getImplementationName() {
- return OUString(
- "comp.test.testtools.bridgetest.Constructors");
+ return
+ "comp.test.testtools.bridgetest.Constructors";
}
css::uno::Sequence< OUString > getSupportedServiceNames() {
@@ -430,8 +430,8 @@ css::uno::Reference< css::uno::XInterface > create2(
}
OUString getImplementationName2() {
- return OUString(
- "comp.test.testtools.bridgetest.Constructors2");
+ return
+ "comp.test.testtools.bridgetest.Constructors2";
}
css::uno::Sequence< OUString > getSupportedServiceNames2() {
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 295e0368acc9..1eb3e9903753 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -1101,7 +1101,7 @@ Reference< XCurrentContextChecker > Test_Impl::getCurrentContextChecker()
OUString Test_Impl::getImplementationName()
{
- return OUString( IMPLNAME );
+ return IMPLNAME;
}
sal_Bool Test_Impl::supportsService( const OUString & rServiceName )
commit cf07303e215380f597fd32756ba990fb5220dcbe
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:47:09 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:53:40 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): toolkit
Change-Id: I598d89be70d476663ffef95029015cba17bf09b9
Reviewed-on: https://gerrit.libreoffice.org/76636
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 13d106391820..06242e18c218 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -143,7 +143,7 @@ void ClassName::MethodName( const EventType& evt ) \
IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodName, EventType )
#define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
- OUString SAL_CALL getImplementationName( ) override { return OUString("stardiv.Toolkit." #ImplName ); } \
+ OUString SAL_CALL getImplementationName( ) override { return "stardiv.Toolkit." #ImplName; } \
css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override \
{ \
css::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index c37b20930a71..0813a5fb10c7 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -68,7 +68,7 @@ private:
// com.sun.star.uno.XServiceInfo:
OUString SAL_CALL AsyncCallback::getImplementationName()
{
- return OUString("com.sun.star.awt.comp.AsyncCallback");
+ return "com.sun.star.awt.comp.AsyncCallback";
}
sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName)
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index f9b55d278655..d821a4c44f80 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -85,7 +85,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, OAccessibleExtendedCo
OUString VCLXAccessibleComponent::getImplementationName()
{
- return OUString("com.sun.star.comp.toolkit.AccessibleWindow");
+ return "com.sun.star.comp.toolkit.AccessibleWindow";
}
sal_Bool VCLXAccessibleComponent::supportsService( const OUString& rServiceName )
diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index 7ddc4ac5796c..5323e077be08 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.cxx
@@ -48,7 +48,7 @@ sal_Int32 VCLXPointer::getType()
OUString VCLXPointer::getImplementationName()
{
- return OUString("stardiv.Toolkit.VCLXPointer");
+ return "stardiv.Toolkit.VCLXPointer";
}
sal_Bool VCLXPointer::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 2897d3bafdb0..bcc9c2d20a9c 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -360,7 +360,7 @@ css::uno::Reference< css::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrint
OUString VCLXPrinterServer::getImplementationName()
{
- return OUString("stardiv.Toolkit.VCLXPrinterServer");
+ return "stardiv.Toolkit.VCLXPrinterServer";
}
sal_Bool VCLXPrinterServer::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 96699c246d19..1f97511e0f27 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1833,7 +1833,7 @@ css::uno::Reference< css::datatransfer::clipboard::XClipboard > SAL_CALL VCLXToo
// XServiceInfo
OUString VCLXToolkit::getImplementationName()
{
- return OUString("stardiv.Toolkit.VCLXToolkit");
+ return "stardiv.Toolkit.VCLXToolkit";
}
sal_Bool VCLXToolkit::supportsService( const OUString& rServiceName )
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 23bb5a4f4b3e..bcc0e0628130 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -88,7 +88,7 @@ public:
OUString AnimatedImagesControl::GetComponentServiceName()
{
- return OUString( "AnimatedImages" );
+ return "AnimatedImages";
}
@@ -119,7 +119,7 @@ public:
OUString SAL_CALL AnimatedImagesControl::getImplementationName( )
{
- return OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" );
+ return "org.openoffice.comp.toolkit.AnimatedImagesControl";
}
@@ -280,13 +280,13 @@ namespace toolkit {
OUString SAL_CALL AnimatedImagesControlModel::getServiceName()
{
- return OUString("com.sun.star.awt.AnimatedImagesControlModel");
+ return "com.sun.star.awt.AnimatedImagesControlModel";
}
OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( )
{
- return OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel");
+ return "org.openoffice.comp.toolkit.AnimatedImagesControlModel";
}
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 278cbf894711..147a1732885c 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -178,13 +178,13 @@ static void lcl_throwElementExistException( )
static OUString getTabIndexPropertyName( )
{
- return OUString( "TabIndex" );
+ return "TabIndex";
}
static OUString getStepPropertyName( )
{
- return OUString( "Step" );
+ return "Step";
}
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 328b62d07905..dede0319d66d 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -157,7 +157,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return OUString("stardiv.Toolkit.UnoControlDialogModel"); }
+ { return "stardiv.Toolkit.UnoControlDialogModel"; }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
@@ -232,7 +232,7 @@ rtl::Reference<UnoControlModel> UnoControlDialogModel::Clone() const
OUString UnoControlDialogModel::getServiceName( )
{
- return OUString("stardiv.vcl.controlmodel.Dialog");
+ return "stardiv.vcl.controlmodel.Dialog";
}
Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -313,9 +313,9 @@ OUString UnoDialogControl::GetComponentServiceName()
bool bDecoration( true );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
- return OUString("Dialog");
+ return "Dialog";
else
- return OUString("TabPage");
+ return "TabPage";
}
void UnoDialogControl::dispose()
@@ -374,7 +374,7 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons
OUString UnoDialogControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoDialogControl");
+ return "stardiv.Toolkit.UnoDialogControl";
}
sal_Bool UnoDialogControl::supportsService(OUString const & ServiceName)
@@ -760,9 +760,9 @@ OUString UnoMultiPageControl::GetComponentServiceName()
bool bDecoration( true );
ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_DECORATION )) >>= bDecoration;
if ( bDecoration )
- return OUString("tabcontrol");
+ return "tabcontrol";
// Hopefully we can tweak the tabcontrol to display without tabs
- return OUString("tabcontrolnotabs");
+ return "tabcontrolnotabs";
}
void UnoMultiPageControl::bindPage( const uno::Reference< awt::XControl >& _rxControl )
@@ -871,7 +871,7 @@ rtl::Reference<UnoControlModel> UnoMultiPageModel::Clone() const
OUString UnoMultiPageModel::getServiceName()
{
- return OUString( "com.sun.star.awt.UnoMultiPageModel" );
+ return "com.sun.star.awt.UnoMultiPageModel";
}
uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -932,7 +932,7 @@ UnoPageControl::~UnoPageControl()
OUString UnoPageControl::GetComponentServiceName()
{
- return OUString("tabpage");
+ return "tabpage";
}
@@ -978,7 +978,7 @@ rtl::Reference<UnoControlModel> UnoPageModel::Clone() const
OUString UnoPageModel::getServiceName()
{
- return OUString( "com.sun.star.awt.UnoPageModel" );
+ return "com.sun.star.awt.UnoPageModel";
}
uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1026,7 +1026,7 @@ UnoFrameControl::~UnoFrameControl()
OUString UnoFrameControl::GetComponentServiceName()
{
- return OUString("frame");
+ return "frame";
}
void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
@@ -1125,7 +1125,7 @@ rtl::Reference<UnoControlModel> UnoFrameModel::Clone() const
OUString UnoFrameModel::getServiceName()
{
- return OUString( "com.sun.star.awt.UnoFrameModel" );
+ return "com.sun.star.awt.UnoFrameModel";
}
uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index c08e1f3f63ca..c7ff000eac80 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -407,7 +407,7 @@ namespace toolkit
OUString UnoControlFormattedFieldModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlFormattedFieldModel");
+ return "stardiv.Toolkit.UnoControlFormattedFieldModel";
}
css::uno::Sequence<OUString>
@@ -431,7 +431,7 @@ namespace toolkit
OUString UnoFormattedFieldControl::GetComponentServiceName()
{
- return OUString("FormattedField");
+ return "FormattedField";
}
@@ -456,7 +456,7 @@ namespace toolkit
OUString UnoFormattedFieldControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoFormattedFieldControl");
+ return "stardiv.Toolkit.UnoFormattedFieldControl";
}
css::uno::Sequence<OUString>
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 3883f662a48b..460b4bcc03d0 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -317,7 +317,7 @@ private:
OUString SAL_CALL DefaultGridColumnModel::getImplementationName( )
{
- return OUString("stardiv.Toolkit.DefaultGridColumnModel");
+ return "stardiv.Toolkit.DefaultGridColumnModel";
}
sal_Bool SAL_CALL DefaultGridColumnModel::supportsService( const OUString& i_serviceName )
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index ae08e1da9a6a..b2c13aac6b4a 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -480,7 +480,7 @@ private:
OUString SAL_CALL DefaultGridDataModel::getImplementationName( )
{
- return OUString("stardiv.Toolkit.DefaultGridDataModel");
+ return "stardiv.Toolkit.DefaultGridDataModel";
}
sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const OUString& ServiceName )
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index acb64eccf76c..f56c250156c9 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -263,7 +263,7 @@ namespace toolkit
OUString SAL_CALL GridColumn::getImplementationName( )
{
- return OUString( "org.openoffice.comp.toolkit.GridColumn" );
+ return "org.openoffice.comp.toolkit.GridColumn";
}
sal_Bool SAL_CALL GridColumn::supportsService( const OUString& i_serviceName )
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 2602d112a017..88335b4d5baf 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -212,7 +212,7 @@ void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
OUString UnoGridModel::getServiceName()
{
- return OUString("com.sun.star.awt.grid.UnoControlGridModel");
+ return "com.sun.star.awt.grid.UnoControlGridModel";
}
@@ -281,7 +281,7 @@ UnoGridControl::~UnoGridControl()
OUString UnoGridControl::GetComponentServiceName()
{
- return OUString("Grid");
+ return "Grid";
}
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index b82887f35d00..e0dc8ba4fcd7 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -65,7 +65,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return OUString("stardiv.Toolkit.GridControlModel"); }
+ { return "stardiv.Toolkit.GridControlModel"; }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
@@ -116,7 +116,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return OUString("stardiv.Toolkit.GridControl"); }
+ { return "stardiv.Toolkit.GridControl"; }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index d56ae124b781..44204b35458b 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -869,7 +869,7 @@ void lcl_clear( STLCONTAINER& i_container )
OUString SAL_CALL SortableGridDataModel::getImplementationName( )
{
- return OUString( "org.openoffice.comp.toolkit.SortableGridDataModel" );
+ return "org.openoffice.comp.toolkit.SortableGridDataModel";
}
sal_Bool SAL_CALL SortableGridDataModel::supportsService( const OUString& i_serviceName )
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 54dbb3e20683..ee9aed15d455 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -85,7 +85,7 @@ static void lcl_throwIndexOutOfBoundsException( )
OUString UnoControlRoadmapModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlRoadmapModel");
+ return "stardiv.Toolkit.UnoControlRoadmapModel";
}
css::uno::Sequence<OUString>
@@ -385,7 +385,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
OUString UnoRoadmapControl::GetComponentServiceName()
{
- return OUString("Roadmap");
+ return "Roadmap";
}
@@ -481,7 +481,7 @@ void SAL_CALL UnoRoadmapControl::propertyChange( const PropertyChangeEvent& evt
OUString UnoRoadmapControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoRoadmapControl");
+ return "stardiv.Toolkit.UnoRoadmapControl";
}
css::uno::Sequence<OUString> UnoRoadmapControl::getSupportedServiceNames()
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index 5a35fca98d01..d4580cd8c029 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -75,7 +75,7 @@ css::uno::Reference< css:: beans::XPropertySetInfo > SAL_CALL
OUString SAL_CALL ORoadmapEntry::getImplementationName( )
{
- return OUString("com.sun.star.comp.toolkit.RoadmapItem");
+ return "com.sun.star.comp.toolkit.RoadmapItem";
}
sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName )
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index ce390e0fd2a5..50ca0bdcaa59 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -103,13 +103,13 @@ protected:
OUString SAL_CALL SpinningProgressControlModel::getServiceName()
{
- return OUString("com.sun.star.awt.SpinningProgressControlModel");
+ return "com.sun.star.awt.SpinningProgressControlModel";
}
OUString SAL_CALL SpinningProgressControlModel::getImplementationName( )
{
- return OUString("org.openoffice.comp.toolkit.SpinningProgressControlModel");
+ return "org.openoffice.comp.toolkit.SpinningProgressControlModel";
}
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 0bfdc6302ad7..6d0bc4621809 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -365,7 +365,7 @@ void StdTabController::activateLast( )
OUString StdTabController::getImplementationName()
{
- return OUString("stardiv.Toolkit.StdTabController");
+ return "stardiv.Toolkit.StdTabController";
}
sal_Bool StdTabController::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 17b5d8144480..f21720854035 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -419,7 +419,7 @@ void StdTabControllerModel::read( const css::uno::Reference< css::io::XObjectInp
OUString StdTabControllerModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.StdTabControllerModel");
+ return "stardiv.Toolkit.StdTabControllerModel";
}
sal_Bool StdTabControllerModel::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 61f17296a348..f488687f5d75 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -63,7 +63,7 @@ UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Referenc
OUString UnoControlTabPageContainerModel::getServiceName()
{
- return OUString("com.sun.star.awt.tab.UnoControlTabPageContainerModel");
+ return "com.sun.star.awt.tab.UnoControlTabPageContainerModel";
}
uno::Any UnoControlTabPageContainerModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -220,7 +220,7 @@ UnoControlTabPageContainer::UnoControlTabPageContainer( const uno::Reference< un
OUString UnoControlTabPageContainer::GetComponentServiceName()
{
- return OUString("TabPageContainer");
+ return "TabPageContainer";
}
void SAL_CALL UnoControlTabPageContainer::dispose( )
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 334557a9ff1e..7d0ff366ba73 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -59,7 +59,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c
OUString SAL_CALL UnoControlTabPageModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlTabPageModel");
+ return "stardiv.Toolkit.UnoControlTabPageModel";
}
css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServiceNames()
@@ -72,7 +72,7 @@ css::uno::Sequence< OUString > SAL_CALL UnoControlTabPageModel::getSupportedServ
OUString UnoControlTabPageModel::getServiceName( )
{
- return OUString("com.sun.star.awt.tab.UnoControlTabPageModel");
+ return "com.sun.star.awt.tab.UnoControlTabPageModel";
}
Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -171,12 +171,12 @@ UnoControlTabPage::~UnoControlTabPage()
OUString UnoControlTabPage::GetComponentServiceName()
{
- return OUString("TabPageModel");
+ return "TabPageModel";
}
OUString SAL_CALL UnoControlTabPage::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlTabPage");
+ return "stardiv.Toolkit.UnoControlTabPage";
}
sal_Bool SAL_CALL UnoControlTabPage::supportsService(OUString const & ServiceName)
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index f0efbaccecfe..5ca66a34ab9b 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -52,7 +52,7 @@ namespace toolkit
OUString UnoControlScrollBarModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlScrollBarModel");
+ return "stardiv.Toolkit.UnoControlScrollBarModel";
}
css::uno::Sequence<OUString>
@@ -104,7 +104,7 @@ namespace toolkit
OUString UnoScrollBarControl::GetComponentServiceName()
{
- return OUString("ScrollBar");
+ return "ScrollBar";
}
// css::uno::XInterface
@@ -290,7 +290,7 @@ namespace toolkit
OUString UnoScrollBarControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoScrollBarControl");
+ return "stardiv.Toolkit.UnoScrollBarControl";
}
css::uno::Sequence<OUString> UnoScrollBarControl::getSupportedServiceNames()
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 3baf18dfbbde..25702fd45886 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -144,7 +144,7 @@ public:
OUString UnoSpinButtonModel::getServiceName( )
{
- return OUString("com.sun.star.awt.UnoControlSpinButtonModel");
+ return "com.sun.star.awt.UnoControlSpinButtonModel";
}
@@ -183,7 +183,7 @@ public:
OUString SAL_CALL UnoSpinButtonModel::getImplementationName( )
{
- return OUString( "stardiv.Toolkit.UnoSpinButtonModel" );
+ return "stardiv.Toolkit.UnoSpinButtonModel";
}
@@ -208,7 +208,7 @@ public:
OUString UnoSpinButtonControl::GetComponentServiceName()
{
- return OUString("SpinButton");
+ return "SpinButton";
}
@@ -246,7 +246,7 @@ public:
OUString SAL_CALL UnoSpinButtonControl::getImplementationName( )
{
- return OUString( "stardiv.Toolkit.UnoSpinButtonControl" );
+ return "stardiv.Toolkit.UnoSpinButtonControl";
}
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 6a8c77c11941..3d374bfadacd 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -77,7 +77,7 @@ rtl::Reference<UnoControlModel> UnoTreeModel::Clone() const
OUString UnoTreeModel::getServiceName()
{
- return OUString( "com.sun.star.awt.tree.TreeControlModel" );
+ return "com.sun.star.awt.tree.TreeControlModel";
}
Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -191,7 +191,7 @@ UnoTreeControl::UnoTreeControl()
OUString UnoTreeControl::GetComponentServiceName()
{
- return OUString("Tree");
+ return "Tree";
}
diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index b72511077574..0d7dc6a066cc 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -49,7 +49,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return OUString("stardiv.Toolkit.TreeControlModel"); }
+ { return "stardiv.Toolkit.TreeControlModel"; }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index 8878ef23b413..822b22b4d50e 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -239,7 +239,7 @@ void SAL_CALL MutableTreeDataModel::removeEventListener( const Reference< XEvent
OUString SAL_CALL MutableTreeDataModel::getImplementationName( )
{
- return OUString( "toolkit.MutableTreeDataModel" );
+ return "toolkit.MutableTreeDataModel";
}
sal_Bool SAL_CALL MutableTreeDataModel::supportsService( const OUString& ServiceName )
@@ -504,7 +504,7 @@ OUString SAL_CALL MutableTreeNode::getCollapsedGraphicURL( )
OUString SAL_CALL MutableTreeNode::getImplementationName( )
{
- return OUString( "toolkit.MutableTreeNode" );
+ return "toolkit.MutableTreeNode";
}
sal_Bool SAL_CALL MutableTreeNode::supportsService( const OUString& ServiceName )
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index eacaffbc0ee1..77eb161f8ac9 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -780,7 +780,7 @@ void UnoControlContainer::setVisible( sal_Bool bVisible )
OUString UnoControlContainer::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlContainer");
+ return "stardiv.Toolkit.UnoControlContainer";
}
css::uno::Sequence<OUString> UnoControlContainer::getSupportedServiceNames()
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 162173157b29..ef00b644c84f 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -47,7 +47,7 @@ OUString UnoControlContainerModel::getServiceName()
OUString UnoControlContainerModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlContainerModel");
+ return "stardiv.Toolkit.UnoControlContainerModel";
}
css::uno::Sequence<OUString>
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 46866c803e50..97b304699154 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -149,7 +149,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlEditModel::getPropertySetInf
OUString UnoControlEditModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlEditModel");
+ return "stardiv.Toolkit.UnoControlEditModel";
}
css::uno::Sequence<OUString> UnoControlEditModel::getSupportedServiceNames()
@@ -468,7 +468,7 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
OUString UnoEditControl::getImplementationName( )
{
- return OUString( "stardiv.Toolkit.UnoEditControl" );
+ return "stardiv.Toolkit.UnoEditControl";
}
uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames()
@@ -543,7 +543,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFileControlModel::getPropert
OUString UnoControlFileControlModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlFileControlModel");
+ return "stardiv.Toolkit.UnoControlFileControlModel";
}
css::uno::Sequence<OUString>
@@ -574,12 +574,12 @@ UnoFileControl::UnoFileControl()
OUString UnoFileControl::GetComponentServiceName()
{
- return OUString("filecontrol");
+ return "filecontrol";
}
OUString UnoFileControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoFileControl");
+ return "stardiv.Toolkit.UnoFileControl";
}
css::uno::Sequence<OUString> UnoFileControl::getSupportedServiceNames()
@@ -724,7 +724,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlButtonModel::getPropertySetI
OUString UnoControlButtonModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlButtonModel");
+ return "stardiv.Toolkit.UnoControlButtonModel";
}
css::uno::Sequence<OUString> UnoControlButtonModel::getSupportedServiceNames()
@@ -882,7 +882,7 @@ awt::Size UnoButtonControl::calcAdjustedSize( const awt::Size& rNewSize )
OUString UnoButtonControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoButtonControl");
+ return "stardiv.Toolkit.UnoButtonControl";
}
css::uno::Sequence<OUString> UnoButtonControl::getSupportedServiceNames()
@@ -919,7 +919,7 @@ OUString UnoControlImageControlModel::getServiceName()
OUString UnoControlImageControlModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlImageControlModel");
+ return "stardiv.Toolkit.UnoControlImageControlModel";
}
css::uno::Sequence<OUString>
@@ -1018,7 +1018,7 @@ UnoImageControlControl::UnoImageControlControl()
OUString UnoImageControlControl::GetComponentServiceName()
{
- return OUString("fixedimage");
+ return "fixedimage";
}
void UnoImageControlControl::dispose()
@@ -1051,7 +1051,7 @@ awt::Size UnoImageControlControl::calcAdjustedSize( const awt::Size& rNewSize )
OUString UnoImageControlControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoImageControlControl");
+ return "stardiv.Toolkit.UnoImageControlControl";
}
css::uno::Sequence<OUString> UnoImageControlControl::getSupportedServiceNames()
@@ -1116,7 +1116,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlRadioButtonModel::getPropert
OUString UnoControlRadioButtonModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlRadioButtonModel");
+ return "stardiv.Toolkit.UnoControlRadioButtonModel";
}
css::uno::Sequence<OUString>
@@ -1151,7 +1151,7 @@ UnoRadioButtonControl::UnoRadioButtonControl()
OUString UnoRadioButtonControl::GetComponentServiceName()
{
- return OUString("radiobutton");
+ return "radiobutton";
}
void UnoRadioButtonControl::dispose()
@@ -1295,7 +1295,7 @@ awt::Size UnoRadioButtonControl::calcAdjustedSize( const awt::Size& rNewSize )
OUString UnoRadioButtonControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoRadioButtonControl");
+ return "stardiv.Toolkit.UnoRadioButtonControl";
}
css::uno::Sequence<OUString> UnoRadioButtonControl::getSupportedServiceNames()
@@ -1358,7 +1358,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCheckBoxModel::getPropertySe
OUString UnoControlCheckBoxModel::getImplementationName()
{
- return OUString( "stardiv.Toolkit.UnoControlCheckBoxModel");
+ return "stardiv.Toolkit.UnoControlCheckBoxModel";
}
css::uno::Sequence<OUString> UnoControlCheckBoxModel::getSupportedServiceNames()
@@ -1391,7 +1391,7 @@ UnoCheckBoxControl::UnoCheckBoxControl()
OUString UnoCheckBoxControl::GetComponentServiceName()
{
- return OUString("checkbox");
+ return "checkbox";
}
void UnoCheckBoxControl::dispose()
@@ -1509,7 +1509,7 @@ awt::Size UnoCheckBoxControl::calcAdjustedSize( const awt::Size& rNewSize )
OUString UnoCheckBoxControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoCheckBoxControl");
+ return "stardiv.Toolkit.UnoCheckBoxControl";
}
css::uno::Sequence<OUString> UnoCheckBoxControl::getSupportedServiceNames()
@@ -1540,7 +1540,7 @@ UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X
OUString UnoControlFixedHyperlinkModel::getServiceName()
{
- return OUString( "com.sun.star.awt.UnoControlFixedHyperlinkModel" );
+ return "com.sun.star.awt.UnoControlFixedHyperlinkModel";
}
uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1595,7 +1595,7 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
OUString UnoFixedHyperlinkControl::GetComponentServiceName()
{
- return OUString("fixedhyperlink");
+ return "fixedhyperlink";
}
// uno::XInterface
@@ -1733,7 +1733,7 @@ UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentC
OUString UnoControlFixedTextModel::getServiceName()
{
- return OUString( "stardiv.vcl.controlmodel.FixedText" );
+ return "stardiv.vcl.controlmodel.FixedText";
}
uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1765,7 +1765,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedTextModel::getPropertyS
OUString UnoControlFixedTextModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlFixedTextModel");
+ return "stardiv.Toolkit.UnoControlFixedTextModel";
}
css::uno::Sequence<OUString>
@@ -1798,7 +1798,7 @@ UnoFixedTextControl::UnoFixedTextControl()
OUString UnoFixedTextControl::GetComponentServiceName()
{
- return OUString("fixedtext");
+ return "fixedtext";
}
// uno::XInterface
@@ -1872,7 +1872,7 @@ awt::Size UnoFixedTextControl::calcAdjustedSize( const awt::Size& rNewSize )
OUString UnoFixedTextControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoFixedTextControl");
+ return "stardiv.Toolkit.UnoFixedTextControl";
}
css::uno::Sequence<OUString> UnoFixedTextControl::getSupportedServiceNames()
@@ -1939,7 +1939,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlGroupBoxModel::getPropertySe
OUString UnoControlGroupBoxModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlGroupBoxModel");
+ return "stardiv.Toolkit.UnoControlGroupBoxModel";
}
css::uno::Sequence<OUString> UnoControlGroupBoxModel::getSupportedServiceNames()
@@ -1971,7 +1971,7 @@ UnoGroupBoxControl::UnoGroupBoxControl()
OUString UnoGroupBoxControl::GetComponentServiceName()
{
- return OUString("groupbox");
+ return "groupbox";
}
sal_Bool UnoGroupBoxControl::isTransparent()
@@ -1981,7 +1981,7 @@ sal_Bool UnoGroupBoxControl::isTransparent()
OUString UnoGroupBoxControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoGroupBoxControl");
+ return "stardiv.Toolkit.UnoGroupBoxControl";
}
css::uno::Sequence<OUString> UnoGroupBoxControl::getSupportedServiceNames()
@@ -2131,7 +2131,7 @@ UnoControlListBoxModel::~UnoControlListBoxModel()
OUString UnoControlListBoxModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlListBoxModel");
+ return "stardiv.Toolkit.UnoControlListBoxModel";
}
css::uno::Sequence<OUString> UnoControlListBoxModel::getSupportedServiceNames()
@@ -2565,12 +2565,12 @@ UnoListBoxControl::UnoListBoxControl()
OUString UnoListBoxControl::GetComponentServiceName()
{
- return OUString("listbox");
+ return "listbox";
}
OUString UnoListBoxControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoListBoxControl");
+ return "stardiv.Toolkit.UnoListBoxControl";
}
css::uno::Sequence<OUString> UnoListBoxControl::getSupportedServiceNames()
@@ -2979,7 +2979,7 @@ UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentCon
OUString UnoControlComboBoxModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlComboBoxModel");
+ return "stardiv.Toolkit.UnoControlComboBoxModel";
}
css::uno::Sequence<OUString> UnoControlComboBoxModel::getSupportedServiceNames()
@@ -3071,7 +3071,7 @@ UnoComboBoxControl::UnoComboBoxControl()
OUString UnoComboBoxControl::getImplementationName()
{
- return OUString( "stardiv.Toolkit.UnoComboBoxControl");
+ return "stardiv.Toolkit.UnoComboBoxControl";
}
css::uno::Sequence<OUString> UnoComboBoxControl::getSupportedServiceNames()
@@ -3085,7 +3085,7 @@ css::uno::Sequence<OUString> UnoComboBoxControl::getSupportedServiceNames()
OUString UnoComboBoxControl::GetComponentServiceName()
{
- return OUString("combobox");
+ return "combobox";
}
void UnoComboBoxControl::dispose()
@@ -3512,7 +3512,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlDateFieldModel::getPropertyS
OUString UnoControlDateFieldModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlDateFieldModel");
+ return "stardiv.Toolkit.UnoControlDateFieldModel";
}
css::uno::Sequence<OUString>
@@ -3546,7 +3546,7 @@ UnoDateFieldControl::UnoDateFieldControl()
OUString UnoDateFieldControl::GetComponentServiceName()
{
- return OUString("datefield");
+ return "datefield";
}
// uno::XInterface
@@ -3730,7 +3730,7 @@ sal_Bool UnoDateFieldControl::isStrictFormat()
OUString UnoDateFieldControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoDateFieldControl");
+ return "stardiv.Toolkit.UnoDateFieldControl";
}
css::uno::Sequence<OUString> UnoDateFieldControl::getSupportedServiceNames()
@@ -3789,7 +3789,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlTimeFieldModel::getPropertyS
OUString UnoControlTimeFieldModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlTimeFieldModel");
+ return "stardiv.Toolkit.UnoControlTimeFieldModel";
}
css::uno::Sequence<OUString>
@@ -3822,7 +3822,7 @@ UnoTimeFieldControl::UnoTimeFieldControl()
OUString UnoTimeFieldControl::GetComponentServiceName()
{
- return OUString("timefield");
+ return "timefield";
}
// uno::XInterface
@@ -3966,7 +3966,7 @@ sal_Bool UnoTimeFieldControl::isStrictFormat()
OUString UnoTimeFieldControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoTimeFieldControl");
+ return "stardiv.Toolkit.UnoTimeFieldControl";
}
css::uno::Sequence<OUString> UnoTimeFieldControl::getSupportedServiceNames()
@@ -4025,7 +4025,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlNumericFieldModel::getProper
OUString UnoControlNumericFieldModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlNumericFieldModel");
+ return "stardiv.Toolkit.UnoControlNumericFieldModel";
}
css::uno::Sequence<OUString>
@@ -4058,7 +4058,7 @@ UnoNumericFieldControl::UnoNumericFieldControl()
OUString UnoNumericFieldControl::GetComponentServiceName()
{
- return OUString("numericfield");
+ return "numericfield";
}
// uno::XInterface
@@ -4173,7 +4173,7 @@ sal_Bool UnoNumericFieldControl::isStrictFormat()
OUString UnoNumericFieldControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoNumericFieldControl");
+ return "stardiv.Toolkit.UnoNumericFieldControl";
}
css::uno::Sequence<OUString> UnoNumericFieldControl::getSupportedServiceNames()
@@ -4256,7 +4256,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlCurrencyFieldModel::getPrope
OUString UnoControlCurrencyFieldModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlCurrencyFieldModel");
+ return "stardiv.Toolkit.UnoControlCurrencyFieldModel";
}
css::uno::Sequence<OUString>
@@ -4289,7 +4289,7 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl()
OUString UnoCurrencyFieldControl::GetComponentServiceName()
{
- return OUString("longcurrencyfield");
+ return "longcurrencyfield";
}
// uno::XInterface
@@ -4403,7 +4403,7 @@ sal_Bool UnoCurrencyFieldControl::isStrictFormat()
OUString UnoCurrencyFieldControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoCurrencyFieldControl");
+ return "stardiv.Toolkit.UnoCurrencyFieldControl";
}
css::uno::Sequence<OUString>
@@ -4482,7 +4482,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlPatternFieldModel::getProper
OUString UnoControlPatternFieldModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlPatternFieldModel");
+ return "stardiv.Toolkit.UnoControlPatternFieldModel";
}
css::uno::Sequence<OUString>
@@ -4513,7 +4513,7 @@ UnoPatternFieldControl::UnoPatternFieldControl()
OUString UnoPatternFieldControl::GetComponentServiceName()
{
- return OUString("patternfield");
+ return "patternfield";
}
void UnoPatternFieldControl::ImplSetPeerProperty( const OUString& rPropName, const uno::Any& rVal )
@@ -4596,7 +4596,7 @@ sal_Bool UnoPatternFieldControl::isStrictFormat()
OUString UnoPatternFieldControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoPatternFieldControl");
+ return "stardiv.Toolkit.UnoPatternFieldControl";
}
css::uno::Sequence<OUString> UnoPatternFieldControl::getSupportedServiceNames()
@@ -4667,7 +4667,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlProgressBarModel::getPropert
OUString UnoControlProgressBarModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlProgressBarModel");
+ return "stardiv.Toolkit.UnoControlProgressBarModel";
}
css::uno::Sequence<OUString>
@@ -4698,7 +4698,7 @@ UnoProgressBarControl::UnoProgressBarControl()
OUString UnoProgressBarControl::GetComponentServiceName()
{
- return OUString("ProgressBar");
+ return "ProgressBar";
}
// uno::XInterface
@@ -4767,7 +4767,7 @@ sal_Int32 UnoProgressBarControl::getValue()
OUString UnoProgressBarControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoProgressBarControl");
+ return "stardiv.Toolkit.UnoProgressBarControl";
}
css::uno::Sequence<OUString> UnoProgressBarControl::getSupportedServiceNames()
@@ -4834,7 +4834,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlFixedLineModel::getPropertyS
OUString UnoControlFixedLineModel::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoControlFixedLineModel");
+ return "stardiv.Toolkit.UnoControlFixedLineModel";
}
css::uno::Sequence<OUString>
@@ -4867,7 +4867,7 @@ UnoFixedLineControl::UnoFixedLineControl()
OUString UnoFixedLineControl::GetComponentServiceName()
{
- return OUString("FixedLine");
+ return "FixedLine";
}
sal_Bool UnoFixedLineControl::isTransparent()
@@ -4877,7 +4877,7 @@ sal_Bool UnoFixedLineControl::isTransparent()
OUString UnoFixedLineControl::getImplementationName()
{
- return OUString("stardiv.Toolkit.UnoFixedLineControl");
+ return "stardiv.Toolkit.UnoFixedLineControl";
}
css::uno::Sequence<OUString> UnoFixedLineControl::getSupportedServiceNames()
commit 92a8faa5ea624e670f8ad46235f6c89b99159406
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:47:00 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:53:30 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): tools
Change-Id: I6391e8caf4e344d410a31f45d391059498ebd928
Reviewed-on: https://gerrit.libreoffice.org/76635
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index e393baaaf91e..918746eeaea5 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -247,9 +247,9 @@ OUString INetMIMEMessage::GetDefaultContentType()
aParentCT = pParent->GetDefaultContentType();
if (aParentCT.equalsIgnoreAsciiCase("multipart/digest"))
- return OUString("message/rfc822");
+ return "message/rfc822";
}
- return OUString("text/plain; charset=us-ascii");
+ return "text/plain; charset=us-ascii";
}
void INetMIMEMessage::EnableAttachMultipartFormDataChild()
diff --git a/tools/source/xml/XmlWalker.cxx b/tools/source/xml/XmlWalker.cxx
index 736cd07edeba..b21c22335018 100644
--- a/tools/source/xml/XmlWalker.cxx
+++ b/tools/source/xml/XmlWalker.cxx
@@ -59,10 +59,7 @@ bool XmlWalker::open(SvStream* pStream)
return true;
}
-OString XmlWalker::name()
-{
- return OString(reinterpret_cast<const char*>(mpImpl->mpCurrent->name));
-}
+OString XmlWalker::name() { return reinterpret_cast<const char*>(mpImpl->mpCurrent->name); }
OString XmlWalker::content()
{
commit eda2eb3014cadbc5f9818c84b9a698682a6061e6
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:46:52 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:53:24 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): ucb
Change-Id: Id9c3a97bdb3eaa69973d3742ce57257800fa21ae
Reviewed-on: https://gerrit.libreoffice.org/76634
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 4b229374b027..01cf15cd183c 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -939,7 +939,7 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
OUString SAL_CALL CachedContentResultSet::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.CachedContentResultSet" );
+ return "com.sun.star.comp.ucb.CachedContentResultSet";
}
sal_Bool SAL_CALL CachedContentResultSet::supportsService( const OUString& ServiceName )
@@ -2104,7 +2104,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
// CachedContentResultSetFactory XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetFactory,
- OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ) )
+ "com.sun.star.comp.ucb.CachedContentResultSetFactory" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
CachedContentResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index c410c19dfa68..178a1bb869bf 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -161,7 +161,7 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
OUString SAL_CALL CachedContentResultSetStub::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" );
+ return "com.sun.star.comp.ucb.CachedContentResultSetStub";
}
sal_Bool SAL_CALL CachedContentResultSetStub::supportsService( const OUString& ServiceName )
@@ -541,7 +541,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
// CachedContentResultSetStubFactory XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetStubFactory,
- OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ) )
+ "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & )
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index ba1f72616071..8debcc1ac234 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -121,7 +121,7 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
OUString SAL_CALL CachedDynamicResultSet::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" );
+ return "com.sun.star.comp.ucb.CachedDynamicResultSet";
}
sal_Bool SAL_CALL CachedDynamicResultSet::supportsService( const OUString& ServiceName )
@@ -195,7 +195,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
// CachedDynamicResultSetFactory XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetFactory,
- OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ) )
+ "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
CachedDynamicResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 8197a0a6fe15..3e2affa2270f 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -123,7 +123,7 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
OUString SAL_CALL CachedDynamicResultSetStub::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" );
+ return "com.sun.star.comp.ucb.CachedDynamicResultSetStub";
}
sal_Bool SAL_CALL CachedDynamicResultSetStub::supportsService( const OUString& ServiceName )
@@ -187,7 +187,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
// CachedDynamicResultSetStubFactory XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetStubFactory,
- OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ) )
+ "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
CachedDynamicResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 34da0292938a..3f501ee576b8 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -120,7 +120,7 @@ public:
virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) override;
OUString SAL_CALL getImplementationName() override
- { return OUString(IMPLEMENTATION_NAME); }
+ { return IMPLEMENTATION_NAME; }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx
index b49ebc3d4f51..638db5cc6044 100644
--- a/ucb/source/core/cmdenv.cxx
+++ b/ucb/source/core/cmdenv.cxx
@@ -90,7 +90,7 @@ UcbCommandEnvironment::getSupportedServiceNames()
// static
OUString UcbCommandEnvironment::getImplementationName_Static()
{
- return OUString( "com.sun.star.comp.ucb.CommandEnvironment" );
+ return "com.sun.star.comp.ucb.CommandEnvironment";
}
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index fbf44c7eb091..034b33036250 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -50,7 +50,7 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory()
// XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( UcbContentProviderProxyFactory,
- OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ) )
+ "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
UcbContentProviderProxyFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
@@ -174,7 +174,7 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
OUString SAL_CALL UcbContentProviderProxy::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" );
+ return "com.sun.star.comp.ucb.UcbContentProviderProxy";
}
sal_Bool SAL_CALL UcbContentProviderProxy::supportsService( const OUString& ServiceName )
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 1246d6483051..6e28cd18fc9a 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -333,7 +333,7 @@ void SAL_CALL UniversalContentBroker::removeEventListener(
// XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( UniversalContentBroker,
- OUString( "com.sun.star.comp.ucb.UniversalContentBroker" ) )
+ "com.sun.star.comp.ucb.UniversalContentBroker" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
UniversalContentBroker_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index c5a4fb6113f0..b2aadcec33b0 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -195,7 +195,7 @@ UcbPropertiesManager::~UcbPropertiesManager()
// XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( UcbPropertiesManager,
- OUString( "com.sun.star.comp.ucb.UcbPropertiesManager" ) )
+ "com.sun.star.comp.ucb.UcbPropertiesManager" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
UcbPropertiesManager_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & /*rSMgr*/ )
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 13118c33c6ce..010418323eae 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -158,7 +158,7 @@ UcbStore::~UcbStore()
}
XSERVICEINFO_COMMOM_IMPL( UcbStore,
- OUString( "com.sun.star.comp.ucb.UcbStore" ) )
+ "com.sun.star.comp.ucb.UcbStore" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
UcbStore_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
@@ -258,7 +258,7 @@ PropertySetRegistry::~PropertySetRegistry()
OUString SAL_CALL PropertySetRegistry::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.PropertySetRegistry" );
+ return "com.sun.star.comp.ucb.PropertySetRegistry";
}
sal_Bool SAL_CALL PropertySetRegistry::supportsService( const OUString& ServiceName )
@@ -1096,7 +1096,7 @@ PersistentPropertySet::~PersistentPropertySet()
OUString SAL_CALL PersistentPropertySet::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.PersistentPropertySet" );
+ return "com.sun.star.comp.ucb.PersistentPropertySet";
}
sal_Bool SAL_CALL PersistentPropertySet::supportsService( const OUString& ServiceName )
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 26e4e761e61f..7d8117c9a7c9 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -84,7 +84,7 @@ SortedDynamicResultSet::~SortedDynamicResultSet()
OUString SAL_CALL SortedDynamicResultSet::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" );
+ return "com.sun.star.comp.ucb.SortedDynamicResultSet";
}
sal_Bool SAL_CALL SortedDynamicResultSet::supportsService( const OUString& ServiceName )
@@ -424,7 +424,7 @@ OUString SAL_CALL SortedDynamicResultSetFactory::getImplementationName()
OUString SortedDynamicResultSetFactory::getImplementationName_Static()
{
- return OUString( "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" );
+ return "com.sun.star.comp.ucb.SortedDynamicResultSetFactory";
}
sal_Bool SAL_CALL SortedDynamicResultSetFactory::supportsService( const OUString& ServiceName )
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 118524114b82..3aa745d290fe 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -148,7 +148,7 @@ SortedResultSet::~SortedResultSet()
OUString SAL_CALL SortedResultSet::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.SortedResultSet" );
+ return "com.sun.star.comp.ucb.SortedResultSet";
}
sal_Bool SAL_CALL SortedResultSet::supportsService( const OUString& ServiceName )
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index cf8cdacf05c2..c51459a4b417 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1703,7 +1703,7 @@ namespace cmis
OUString SAL_CALL Content::getImplementationName()
{
- return OUString("com.sun.star.comp.CmisContent");
+ return "com.sun.star.comp.CmisContent";
}
uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx
index eb36fac64232..3584d79d3f12 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -121,7 +121,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
css::ucb::XContentProvider );
XSERVICEINFO_COMMOM_IMPL( ContentProvider,
- OUString("com.sun.star.comp.CmisContentProvider") )
+ "com.sun.star.comp.CmisContentProvider" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 744c6ba84270..d6e470cee749 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -310,7 +310,7 @@ namespace cmis
OUString SAL_CALL RepoContent::getImplementationName()
{
- return OUString("com.sun.star.comp.CmisRepoContent");
+ return "com.sun.star.comp.CmisRepoContent";
}
uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames()
@@ -321,7 +321,7 @@ namespace cmis
OUString SAL_CALL RepoContent::getContentType()
{
- return OUString( CMIS_REPO_TYPE );
+ return CMIS_REPO_TYPE;
}
uno::Any SAL_CALL RepoContent::execute(
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 49a708fdc6a8..8c418f197bfc 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -115,7 +115,7 @@ uno::Reference< uno::XInterface > create(
OUString implName()
{
- return OUString("com.sun.star.comp.ucb.ExpandContentProvider");
+ return "com.sun.star.comp.ucb.ExpandContentProvider";
}
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index efb67d4fdfe2..3610291504cf 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -163,7 +163,7 @@ namespace ucb { namespace ucp { namespace ext
OUString SAL_CALL Content::getImplementationName()
{
- return OUString( "org.openoffice.comp.ucp.ext.Content" );
+ return "org.openoffice.comp.ucp.ext.Content";
}
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 88d00cade588..2689e2c9e2bb 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -56,7 +56,7 @@ namespace ucb { namespace ucp { namespace ext
OUString ContentProvider::getImplementationName_static()
{
- return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" );
+ return "org.openoffice.comp.ucp.ext.ContentProvider";
}
@@ -89,13 +89,13 @@ namespace ucb { namespace ucp { namespace ext
OUString ContentProvider::getRootURL()
{
- return OUString( "vnd.sun.star.extension://" );
+ return "vnd.sun.star.extension://";
}
OUString ContentProvider::getArtificialNodeContentType()
{
- return OUString( "application/vnd.sun.star.extension-content" );
+ return "application/vnd.sun.star.extension-content";
}
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 12ff24619303..9e17496bd7d9 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -223,7 +223,7 @@ BaseContent::dispose()
OUString SAL_CALL
BaseContent::getImplementationName()
{
- return OUString("com.sun.star.comp.ucb.FileContent");
+ return "com.sun.star.comp.ucb.FileContent";
}
sal_Bool SAL_CALL
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 761e248799a4..058ad0e5f76f 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -2945,7 +2945,7 @@ TaskManager::getScheme( OUString& Scheme )
OUString
TaskManager::getImplementationName_static()
{
- return OUString("com.sun.star.comp.ucb.FileProvider");
+ return "com.sun.star.comp.ucb.FileProvider";
}
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 937ebb7a3ce6..f8426a31e4e3 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -169,7 +169,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
OUString SAL_CALL FTPContent::getImplementationName()
{
- return OUString( "com.sun.star.comp.FTPContent");
+ return "com.sun.star.comp.FTPContent";
}
sal_Bool SAL_CALL FTPContent::supportsService( const OUString& ServiceName )
@@ -188,7 +188,7 @@ css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames()
// virtual
OUString SAL_CALL FTPContent::getContentType()
{
- return OUString(FTP_CONTENT_TYPE);
+ return FTP_CONTENT_TYPE;
}
// XCommandProcessor methods.
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 67fc59604623..159e78a81969 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -101,7 +101,7 @@ OUString SAL_CALL
FTPContentIdentifier::getContentProviderScheme(
)
{
- return OUString("ftp");
+ return "ftp";
}
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index c68fbe32dc0a..99cb557db1de 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -106,7 +106,7 @@ OUString SAL_CALL FTPContentProvider::getImplementationName()
OUString FTPContentProvider::getImplementationName_Static()
{
- return OUString("com.sun.star.comp.FTPContentProvider");
+ return "com.sun.star.comp.FTPContentProvider";
}
sal_Bool SAL_CALL FTPContentProvider::supportsService( const OUString& ServiceName )
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index f24fd29d132c..d165262159a0 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -1329,7 +1329,7 @@ css::uno::Any SAL_CALL Content::queryInterface( const css::uno::Type & rType )
OUString SAL_CALL Content::getImplementationName()
{
- return OUString("com.sun.star.comp.GIOContent");
+ return "com.sun.star.comp.GIOContent";
}
css::uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index d7508b273ca5..a27e0e9ec79f 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -97,7 +97,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
css::ucb::XContentProvider );
XSERVICEINFO_COMMOM_IMPL( ContentProvider,
- OUString( "com.sun.star.comp.GIOContentProvider" ) )
+ "com.sun.star.comp.GIOContentProvider" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 4b55810aa923..3c2b23538d88 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -246,7 +246,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
// virtual
OUString SAL_CALL HierarchyContent::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.HierarchyContent" );
+ return "com.sun.star.comp.ucb.HierarchyContent";
}
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 19438513dd4c..295a86612448 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -229,7 +229,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource,
// XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( HierarchyDataSource,
- OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) )
+ "com.sun.star.comp.ucb.HierarchyDataSource" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
HierarchyDataSource_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
@@ -611,7 +611,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes()
OUString SAL_CALL HierarchyDataAccess::getImplementationName()
{
- return OUString("com.sun.star.comp.ucb.HierarchyDataAccess");
+ return "com.sun.star.comp.ucb.HierarchyDataAccess";
}
sal_Bool SAL_CALL HierarchyDataAccess::supportsService( const OUString& ServiceName )
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index be2ae768a041..4c288a45ff83 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -99,7 +99,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
// XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( HierarchyContentProvider,
- OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ) )
+ "com.sun.star.comp.ucb.HierarchyContentProvider" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
HierarchyContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx
index 78bac968b722..75bc7404fc0d 100644
--- a/ucb/source/ucp/image/ucpimage.cxx
+++ b/ucb/source/ucp/image/ucpimage.cxx
@@ -48,7 +48,7 @@ public:
private:
OUString SAL_CALL getImplementationName() override
- { return OUString("com.sun.star.comp.ucb.ImageContentProvider"); }
+ { return "com.sun.star.comp.ucb.ImageContentProvider"; }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 8399b2298f12..587f0682e5ca 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -360,7 +360,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
// virtual
OUString SAL_CALL Content::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.PackageContent" );
+ return "com.sun.star.comp.ucb.PackageContent";
}
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index f07c88f2410a..7b7848e9a72d 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -141,7 +141,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
// XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( ContentProvider,
- OUString( "com.sun.star.comp.ucb.PackageContentProvider" ) )
+ "com.sun.star.comp.ucb.PackageContentProvider" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 9f9377a711e6..93b4cff26e67 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -263,7 +263,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
// virtual
OUString SAL_CALL Content::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" );
+ return "com.sun.star.comp.ucb.TransientDocumentsContent";
}
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index 4aea87a897aa..c79380c9b5b7 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -77,8 +77,8 @@ DocumentContentFactory::getSupportedServiceNames()
// static
OUString DocumentContentFactory::getImplementationName_Static()
{
- return OUString(
- "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory" );
+ return
+ "com.sun.star.comp.ucb.TransientDocumentsDocumentContentFactory";
}
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 9ef2524ae891..006f135b7701 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -108,7 +108,7 @@ XTYPEPROVIDER_IMPL_5( ContentProvider,
// XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( ContentProvider,
- OUString( "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ) )
+ "com.sun.star.comp.ucb.TransientDocumentsContentProvider" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 6a825682a6dc..17db426dcf5b 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -222,7 +222,7 @@ OUString NeonUri::GetPathBaseName () const
return aTemp;
}
else
- return OUString("/");
+ return "/";
}
bool NeonUri::operator== ( const NeonUri & rOther ) const
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index cb1e2e02d2fc..e9f5e4a761a2 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -401,7 +401,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
// virtual
OUString SAL_CALL Content::getImplementationName()
{
- return OUString( "com.sun.star.comp.ucb.WebDAVContent" );
+ return "com.sun.star.comp.ucb.WebDAVContent";
}
@@ -434,9 +434,9 @@ OUString SAL_CALL Content::getContentType()
}
if ( bFolder )
- return OUString( WEBDAV_COLLECTION_TYPE );
+ return WEBDAV_COLLECTION_TYPE;
- return OUString( WEBDAV_CONTENT_TYPE );
+ return WEBDAV_CONTENT_TYPE;
}
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index d79818d79f44..3b821e61aa9d 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -97,7 +97,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
// XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( ContentProvider,
- OUString( "com.sun.star.comp.WebDAVContentProvider" ) )
+ "com.sun.star.comp.WebDAVContentProvider" )
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface >
ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
commit a8dfa13fe0f99638f21795dbbb6b5050d5f2fb57
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:46:45 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:53:18 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): ucbhelper
Change-Id: I7b795ca7180b87de717af9b7cbe59cb1bf130b36
Reviewed-on: https://gerrit.libreoffice.org/76633
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index ecc8cffe06bb..82d7dc734a60 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -257,7 +257,7 @@ XTYPEPROVIDER_IMPL_9( ResultSet,
OUString SAL_CALL ResultSet::getImplementationName()
{
- return OUString( "ResultSet" );
+ return "ResultSet";
}
sal_Bool SAL_CALL ResultSet::supportsService( const OUString& ServiceName )
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index b26420bb99bc..279bbc4deb84 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -102,7 +102,7 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper,
OUString SAL_CALL ResultSetImplHelper::getImplementationName()
{
- return OUString( "ResultSetImplHelper" );
+ return "ResultSetImplHelper";
}
sal_Bool SAL_CALL ResultSetImplHelper::supportsService( const OUString& ServiceName )
commit 20aa2915b95ddad570ff1285c4de8a6f982c84b7
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:46:34 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:53:12 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): unoidl
Change-Id: I325e5f2d2e13c10c4d7e9110d41e959fca5e098c
Reviewed-on: https://gerrit.libreoffice.org/76632
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y
index e9812570ed3c..c867c65551eb 100644
--- a/unoidl/source/sourceprovider-parser.y
+++ b/unoidl/source/sourceprovider-parser.y
@@ -82,27 +82,27 @@ void error(YYLTYPE location, yyscan_t yyscanner, OUString const & message) {
OUString flagName(unoidl::detail::SourceProviderFlags flag) {
switch (flag) {
case unoidl::detail::FLAG_ATTRIBUTE:
- return OUString("attribute");
+ return "attribute";
case unoidl::detail::FLAG_BOUND:
- return OUString("bound");
+ return "bound";
case unoidl::detail::FLAG_CONSTRAINED:
- return OUString("constrained");
+ return "constrained";
case unoidl::detail::FLAG_MAYBEAMBIGUOUS:
- return OUString("maybeambiguous");
+ return "maybeambiguous";
case unoidl::detail::FLAG_MAYBEDEFAULT:
- return OUString("maybedefault");
+ return "maybedefault";
case unoidl::detail::FLAG_MAYBEVOID:
- return OUString("maybevoid");
+ return "maybevoid";
case unoidl::detail::FLAG_OPTIONAL:
- return OUString("optional");
+ return "optional";
case unoidl::detail::FLAG_PROPERTY:
- return OUString("property");
+ return "property";
case unoidl::detail::FLAG_READONLY:
- return OUString("readonly");
+ return "readonly";
case unoidl::detail::FLAG_REMOVABLE:
- return OUString("removable");
+ return "removable";
case unoidl::detail::FLAG_TRANSIENT:
- return OUString("transient");
+ return "transient";
default:
assert(false && "this cannot happen"); for (;;) { std::abort(); }
}
@@ -3988,35 +3988,35 @@ OUString SourceProviderType::getName() const {
}
switch (type) {
case unoidl::detail::SourceProviderType::TYPE_VOID:
- return OUString("void");
+ return "void";
case unoidl::detail::SourceProviderType::TYPE_BOOLEAN:
- return OUString("boolean");
+ return "boolean";
case unoidl::detail::SourceProviderType::TYPE_BYTE:
- return OUString("byte");
+ return "byte";
case unoidl::detail::SourceProviderType::TYPE_SHORT:
- return OUString("short");
+ return "short";
case unoidl::detail::SourceProviderType::TYPE_UNSIGNED_SHORT:
- return OUString("unsigned short");
+ return "unsigned short";
case unoidl::detail::SourceProviderType::TYPE_LONG:
- return OUString("long");
+ return "long";
case unoidl::detail::SourceProviderType::TYPE_UNSIGNED_LONG:
- return OUString("unsigned long");
+ return "unsigned long";
case unoidl::detail::SourceProviderType::TYPE_HYPER:
- return OUString("hyper");
+ return "hyper";
case unoidl::detail::SourceProviderType::TYPE_UNSIGNED_HYPER:
- return OUString("unsigned hyper");
+ return "unsigned hyper";
case unoidl::detail::SourceProviderType::TYPE_FLOAT:
- return OUString("float");
+ return "float";
case unoidl::detail::SourceProviderType::TYPE_DOUBLE:
- return OUString("double");
+ return "double";
case unoidl::detail::SourceProviderType::TYPE_CHAR:
- return OUString("char");
+ return "char";
case unoidl::detail::SourceProviderType::TYPE_STRING:
- return OUString("string");
+ return "string";
case unoidl::detail::SourceProviderType::TYPE_TYPE:
- return OUString("type");
+ return "type";
case unoidl::detail::SourceProviderType::TYPE_ANY:
- return OUString("any");
+ return "any";
case unoidl::detail::SourceProviderType::TYPE_SEQUENCE:
assert(subtypes.size() == 1);
return "[]" + subtypes.front().getName();
diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx
index ec7a3fbe7e4f..ff42573f7d1b 100644
--- a/unoidl/source/unoidl-check.cxx
+++ b/unoidl/source/unoidl-check.cxx
@@ -138,11 +138,11 @@ OUString showDirection(
{
switch (direction) {
case unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_IN:
- return OUString("[in]");
+ return "[in]";
case unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_OUT:
- return OUString("[out]");
+ return "[out]";
case unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_IN_OUT:
- return OUString("[inout]");
+ return "[inout]";
default:
assert(false && "this cannot happen"); for (;;) { std::abort(); }
}
More information about the Libreoffice-commits
mailing list