oox: kill no longer needed CREATE_OUSTRING

2 files changed, 8 insertions, 8 deletions

diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index e986b851289f..c68f89619ac4 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -57,7 +57,7 @@ namespace {
 OUString lclGetShapeId( sal_Int32 nShapeId )
 {
     // identifier consists of a literal NUL character, a lowercase 's', and the id
-    return CREATE_OUSTRING( "\0s" ) + OUString::valueOf( nShapeId );
+    return OUString( "\0s" ) + OUString::valueOf( nShapeId );
 }
 
 /** Returns the numeric VML shape identifier from its textual representation. */
@@ -249,7 +249,7 @@ Reference< XShape > Drawing::createAndInsertXControlShape( const ::oox::ole::Emb
         Reference< XControlModel > xCtrlModel( getControlForm().convertAndInsert( rControl, rnCtrlIndex ), UNO_SET_THROW );
 
         // create the control shape
-        xShape = createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.ControlShape" ), rxShapes, rShapeRect );
+        xShape = createAndInsertXShape( "com.sun.star.drawing.ControlShape", rxShapes, rShapeRect );
 
         // set the control model at the shape
         Reference< XControlShape >( xShape, UNO_QUERY_THROW )->setControl( xCtrlModel );
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 6b280b4d1842..8aba860d146c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -542,7 +542,7 @@ Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes >
 // ============================================================================
 
 RectangleShape::RectangleShape( Drawing& rDrawing ) :
-    SimpleShape( rDrawing, CREATE_OUSTRING( "com.sun.star.drawing.RectangleShape" ) )
+    SimpleShape( rDrawing, "com.sun.star.drawing.RectangleShape" )
 {
 }
 
@@ -576,14 +576,14 @@ Reference<XShape> RectangleShape::implConvertAndInsert(const Reference<XShapes>&
 // ============================================================================
 
 EllipseShape::EllipseShape( Drawing& rDrawing ) :
-    SimpleShape( rDrawing, CREATE_OUSTRING( "com.sun.star.drawing.EllipseShape" ) )
+    SimpleShape( rDrawing, "com.sun.star.drawing.EllipseShape" )
 {
 }
 
 // ============================================================================
 
 PolyLineShape::PolyLineShape( Drawing& rDrawing ) :
-    SimpleShape( rDrawing, CREATE_OUSTRING( "com.sun.star.drawing.PolyLineShape" ) )
+    SimpleShape( rDrawing, "com.sun.star.drawing.PolyLineShape" )
 {
 }
 
@@ -711,7 +711,7 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes
 // ============================================================================
 
 CustomShape::CustomShape( Drawing& rDrawing ) :
-    SimpleShape( rDrawing, CREATE_OUSTRING( "com.sun.star.drawing.CustomShape" ) )
+    SimpleShape( rDrawing, "com.sun.star.drawing.CustomShape" )
 {
 }
 
@@ -759,7 +759,7 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes
         awt::Size aOleSize( rShapeRect.Width, rShapeRect.Height );
         if( rFilter.getOleObjectHelper().importOleObject( aOleProps, *pOleObjectInfo, aOleSize ) )
         {
-            Reference< XShape > xShape = mrDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.OLE2Shape" ), rxShapes, rShapeRect );
+            Reference< XShape > xShape = mrDrawing.createAndInsertXShape( "com.sun.star.drawing.OLE2Shape", rxShapes, rShapeRect );
             if( xShape.is() )
             {
                 // set the replacement graphic
@@ -857,7 +857,7 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
     aParentAnchor.maCoordSys = getCoordSystem();
     if( !mxChildren->empty() && (aParentAnchor.maCoordSys.Width > 0) && (aParentAnchor.maCoordSys.Height > 0) ) try
     {
-        xGroupShape = mrDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.GroupShape" ), rxShapes, rShapeRect );
+        xGroupShape = mrDrawing.createAndInsertXShape( "com.sun.star.drawing.GroupShape", rxShapes, rShapeRect );
         Reference< XShapes > xChildShapes( xGroupShape, UNO_QUERY_THROW );
         mxChildren->convertAndInsert( xChildShapes, &aParentAnchor );
         // no child shape has been created - delete the group shape