summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-06 12:32:24 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-06 12:32:24 +0100
commitde7b7e680957c86c1ece9fc9d1d0dd16089f6812 (patch)
tree6b206173e11b52697f628dfecdafe60201b48639 /oox
parentc5376ef685e275f35781a99a37bdf6d13451c015 (diff)
loplugin:stringconstant: elide explicit ctor usage (manually due to macros)
Change-Id: Ic8c87b17d0c2c1b18b01a44ababee0daccf1fb28
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/drawingml.cxx6
-rw-r--r--oox/source/export/shapes.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index bbd2d10adebe..1fdd49d9165e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -104,17 +104,17 @@ namespace oox {
namespace drawingml {
#define GETA(propName) \
- GetProperty( rXPropSet, OUString( #propName ) )
+ GetProperty( rXPropSet, #propName )
#define GETAD(propName) \
- ( GetPropertyAndState( rXPropSet, rXPropState, OUString( #propName ), eState ) && eState == beans::PropertyState_DIRECT_VALUE )
+ ( GetPropertyAndState( rXPropSet, rXPropState, #propName, eState ) && eState == beans::PropertyState_DIRECT_VALUE )
#define GET(variable, propName) \
if ( GETA(propName) ) \
mAny >>= variable;
#define CGETAD(propName) \
- (( bCheckDirect && GetPropertyAndState( rXPropSet, rXPropState, OUString( #propName ), eState ) && eState == beans::PropertyState_DIRECT_VALUE )||GetProperty( rXPropSet, OUString( #propName ) ))
+ (( bCheckDirect && GetPropertyAndState( rXPropSet, rXPropState, #propName, eState ) && eState == beans::PropertyState_DIRECT_VALUE )||GetProperty( rXPropSet, #propName ))
// not thread safe
int DrawingML::mnImageCounter = 1;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 8d562b1de7a1..215183934b4e 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -123,10 +123,10 @@ bool URLTransformer::isExternalURL(const OUString& /*rURL*/) const
}
#define GETA(propName) \
- GetProperty( rXPropSet, OUString(#propName))
+ GetProperty( rXPropSet, #propName)
#define GETAD(propName) \
- ( GetPropertyAndState( rXPropSet, rXPropState, OUString(#propName), eState ) && eState == beans::PropertyState_DIRECT_VALUE )
+ ( GetPropertyAndState( rXPropSet, rXPropState, #propName, eState ) && eState == beans::PropertyState_DIRECT_VALUE )
#define GET(variable, propName) \
if ( GETA(propName) ) \