From 27219b16359bc975be4cc04bf2d0ab167f30c061 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 6 Nov 2015 12:33:18 +0100 Subject: loplugin:stringconstant: elide explicit ctor usage (manually due to macros) Change-Id: Ib1a38d0f19ce7cab596fc32b2db0560dbeabe4ea --- toolkit/source/awt/animatedimagespeer.cxx | 2 +- toolkit/source/controls/dialogcontrol.cxx | 6 +++--- toolkit/source/controls/geometrycontrolmodel.cxx | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'toolkit/source') diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index fdd6134053bd..f5631c041a45 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -112,7 +112,7 @@ namespace toolkit INetURLObject aURL( i_imageURL ); if ( aURL.GetProtocol() != INetProtocol::PrivSoffice ) { - OSL_VERIFY( aURL.insertName( OUString( "hicontrast" ), false, 0 ) ); + OSL_VERIFY( aURL.insertName( "hicontrast", false, 0 ) ); return aURL.GetMainURL( INetURLObject::NO_DECODE ); } // the private: scheme is not considered to be hierarchical by INetURLObject, so manually insert the diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 1cb7127c334f..005984c9ea15 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -65,9 +65,9 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; -#define PROPERTY_DIALOGSOURCEURL OUString( "DialogSourceURL" ) -#define PROPERTY_IMAGEURL OUString( "ImageURL" ) -#define PROPERTY_GRAPHIC OUString( "Graphic" ) +#define PROPERTY_DIALOGSOURCEURL "DialogSourceURL" +#define PROPERTY_IMAGEURL "ImageURL" +#define PROPERTY_GRAPHIC "Graphic" // we probably will need both a hash of control models and hash of controls diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 1c35df60a177..e2dda4bae288 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -40,15 +40,15 @@ #define GCM_PROPERTY_ID_TAG 8 #define GCM_PROPERTY_ID_RESOURCERESOLVER 9 -#define GCM_PROPERTY_POS_X OUString("PositionX") -#define GCM_PROPERTY_POS_Y OUString("PositionY") -#define GCM_PROPERTY_WIDTH OUString("Width") -#define GCM_PROPERTY_HEIGHT OUString("Height") -#define GCM_PROPERTY_NAME OUString("Name") -#define GCM_PROPERTY_TABINDEX OUString("TabIndex") -#define GCM_PROPERTY_STEP OUString("Step") -#define GCM_PROPERTY_TAG OUString("Tag") -#define GCM_PROPERTY_RESOURCERESOLVER OUString("ResourceResolver") +#define GCM_PROPERTY_POS_X "PositionX" +#define GCM_PROPERTY_POS_Y "PositionY" +#define GCM_PROPERTY_WIDTH "Width" +#define GCM_PROPERTY_HEIGHT "Height" +#define GCM_PROPERTY_NAME "Name" +#define GCM_PROPERTY_TABINDEX "TabIndex" +#define GCM_PROPERTY_STEP "Step" +#define GCM_PROPERTY_TAG "Tag" +#define GCM_PROPERTY_RESOURCERESOLVER "ResourceResolver" #define DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT -- cgit