summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-25 13:51:12 +0200
committerNoel Grandin <noel@peralex.com>2013-10-01 10:08:41 +0200
commitec79a0ca3efe2ea5f5f213bc7751f0dcd6c9d712 (patch)
treea41109dcd39ef1874b2493799e627f2bc075467f /oox
parent9a5997374f9b87f187e30b6a302c19c09eae8557 (diff)
convert remnants of String to OUString to OOX module
Change-Id: I55a620063a1021830802c5bc41b425fd134b449f
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/drawingml.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index db4b534e6d08..af1d6e02ef31 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -100,10 +100,10 @@ namespace oox {
namespace drawingml {
#define GETA(propName) \
- GetProperty( rXPropSet, String( #propName ) )
+ GetProperty( rXPropSet, OUString( #propName ) )
#define GETAD(propName) \
- ( GetPropertyAndState( rXPropSet, rXPropState, String( #propName ), eState ) && eState == beans::PropertyState_DIRECT_VALUE )
+ ( GetPropertyAndState( rXPropSet, rXPropState, OUString( #propName ), eState ) && eState == beans::PropertyState_DIRECT_VALUE )
#define GET(variable, propName) \
if ( GETA(propName) ) \
@@ -130,7 +130,7 @@ bool DrawingML::GetProperty( Reference< XPropertySet > rXPropSet, OUString aName
return bRetValue;
}
-bool DrawingML::GetPropertyAndState( Reference< XPropertySet > rXPropSet, Reference< XPropertyState > rXPropState, String aName, PropertyState& eState )
+bool DrawingML::GetPropertyAndState( Reference< XPropertySet > rXPropSet, Reference< XPropertyState > rXPropState, OUString aName, PropertyState& eState )
{
bool bRetValue = false;
@@ -1059,7 +1059,7 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
bPBehind = true;
} else if ( aPropName == "BulletChar" )
{
- aBulletChar = String ( *( (String*)pValue ) ).GetChar( 0 );
+ aBulletChar = OUString ( *( (OUString*)pValue ) )[ 0 ];
//printf ("bullet char: %d\n", aBulletChar.getStr());
}
else if ( aPropName == "BulletFont" )