convert remnants of String to OUString to OOX module

Change-Id: I55a620063a1021830802c5bc41b425fd134b449f

include/oox/export/drawingml.hxx

@@ -32,7 +32,6 @@
 #endif
 
 class Graphic;
-class String;
 
 namespace com { namespace sun { namespace star {
 namespace beans {
@@ -79,7 +78,7 @@ protected:
     bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, OUString aName );
     bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
                   ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState,
-                  String aName, ::com::sun::star::beans::PropertyState& eState );
+                  OUString aName, ::com::sun::star::beans::PropertyState& eState );
     const char* GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, sal_Bool& bIsField );
 
     OUString WriteImage( const OUString& rURL );

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" )