oox: kill no longer needed CREATE_OUSTRING

5 files changed, 24 insertions, 24 deletions

diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index 98884e5a7833..75bd99e6a4d3 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -88,7 +88,7 @@ Reference< XIndexContainer > ContainerHelper::createIndexContainer( const Refere
     if( rxContext.is() ) try
     {
         Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
-        xContainer.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.IndexedPropertyValues" ) ), UNO_QUERY_THROW );
+        xContainer.set( xFactory->createInstance( "com.sun.star.document.IndexedPropertyValues" ), UNO_QUERY_THROW );
     }
     catch( Exception& )
     {
@@ -103,7 +103,7 @@ Reference< XNameContainer > ContainerHelper::createNameContainer( const Referenc
     if( rxContext.is() ) try
     {
         Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
-        xContainer.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.NamedPropertyValues" ) ), UNO_QUERY_THROW );
+        xContainer.set( xFactory->createInstance( "com.sun.star.document.NamedPropertyValues" ), UNO_QUERY_THROW );
     }
     catch( Exception& )
     {
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 8cd4d8d86928..512e9a1f8aa2 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -67,7 +67,7 @@ inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm
 GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) :
     mxContext( rxContext ),
     mxStorage( rxStorage ),
-    maGraphicObjScheme( CREATE_OUSTRING( "vnd.sun.star.GraphicObject:" ) )
+    maGraphicObjScheme( "vnd.sun.star.GraphicObject:" )
 {
     OSL_ENSURE( mxContext.is(), "GraphicHelper::GraphicHelper - missing component context" );
     if( mxContext.is() )
@@ -239,20 +239,20 @@ Reference< XGraphic > GraphicHelper::importGraphic( const Reference< XInputStrea
     if( rxInStrm.is() && mxGraphicProvider.is() ) try
     {
         Sequence< PropertyValue > aArgs( 1 );
-        aArgs[ 0 ].Name = CREATE_OUSTRING( "InputStream" );
+        aArgs[ 0 ].Name = "InputStream";
         aArgs[ 0 ].Value <<= rxInStrm;
 
         if ( pExtHeader && pExtHeader->mapMode > 0 )
         {
             aArgs.realloc( aArgs.getLength() + 1 );
             Sequence< PropertyValue > aFilterData( 3 );
-            aFilterData[ 0 ].Name = CREATE_OUSTRING( "ExternalWidth" );
+            aFilterData[ 0 ].Name = "ExternalWidth";
             aFilterData[ 0 ].Value <<= pExtHeader->xExt;
-            aFilterData[ 1 ].Name = CREATE_OUSTRING( "ExternalHeight" );
+            aFilterData[ 1 ].Name = "ExternalHeight";
             aFilterData[ 1 ].Value <<= pExtHeader->yExt;
-            aFilterData[ 2 ].Name = CREATE_OUSTRING( "ExternalMapMode" );
+            aFilterData[ 2 ].Name = "ExternalMapMode";
             aFilterData[ 2 ].Value <<= pExtHeader->mapMode;
-            aArgs[ 1 ].Name = CREATE_OUSTRING( "FilterData" );
+            aArgs[ 1 ].Name = "FilterData";
             aArgs[ 1 ].Value <<= aFilterData;
         }
 
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index ef3e099db51a..7d3954710974 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -85,15 +85,15 @@ void ObjectContainer::createContainer() const
 // ============================================================================
 
 ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
-    maMarkerContainer(    rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.MarkerTable" ) ),
-    maDashContainer(      rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.DashTable" ) ),
-    maGradientContainer(  rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.GradientTable" ) ),
-    maTransGradContainer(  rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.TransparencyGradientTable" ) ),
-    maBitmapUrlContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.BitmapTable" ) ),
-    maDashNameBase(      CREATE_OUSTRING( "msLineDash " ) ),
-    maGradientNameBase(  CREATE_OUSTRING( "msFillGradient " ) ),
-    maTransGradNameBase(  CREATE_OUSTRING( "msTransGradient " ) ),
-    maBitmapUrlNameBase( CREATE_OUSTRING( "msFillBitmap " ) )
+    maMarkerContainer(    rxModelFactory, "com.sun.star.drawing.MarkerTable" ),
+    maDashContainer(      rxModelFactory, "com.sun.star.drawing.DashTable" ),
+    maGradientContainer(  rxModelFactory, "com.sun.star.drawing.GradientTable" ),
+    maTransGradContainer(  rxModelFactory, "com.sun.star.drawing.TransparencyGradientTable" ),
+    maBitmapUrlContainer( rxModelFactory, "com.sun.star.drawing.BitmapTable" ),
+    maDashNameBase(      "msLineDash " ),
+    maGradientNameBase(  "msFillGradient " ),
+    maTransGradNameBase( "msTransGradient " ),
+    maBitmapUrlNameBase( "msFillBitmap " )
 {
 }
 
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index bd5f8bae0eed..f4b9b11186d7 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -558,7 +558,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
 
     if( value >>= strValue ) {
             printLevel (level);
-            fprintf (stderr,"OUString str = CREATE_OUSTRING (\"%s\");\n", USS( strValue ) );
+            fprintf (stderr,"OUString str = \"%s\";\n", USS( strValue ) );
             return "Any (str)";
     } else if( value >>= strArray ) {
             if (strArray.getLength() == 0)
@@ -580,7 +580,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
                 printLevel (level);
                 fprintf (stderr, "{\n");
                 printLevel (level + 1);
-                fprintf (stderr, "aPropSequence [%d].Name = CREATE_OUSTRING (\"%s\");\n", i, USS( propArray[i].Name ));
+                fprintf (stderr, "aPropSequence [%d].Name = \"%s\";\n", i, USS( propArray[i].Name ));
                 const char *var = lclDumpAnyValueCode( propArray[i].Value, level + 1 );
                 printLevel (level + 1);
                 fprintf (stderr, "aPropSequence [%d].Value = makeAny (%s);\n", i, var);
@@ -631,7 +631,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
                 fprintf (stderr, "aAdjSequence [%d].Value = %s;\n", i, var);
                 if (adjArray[i].Name.getLength() > 0) {
                     printLevel (level + 1);
-                    fprintf (stderr, "aAdjSequence [%d].Name = CREATE_OUSTRING (\"%s\");\n", i, USS (adjArray[i].Name));
+                    fprintf (stderr, "aAdjSequence [%d].Name = \"%s\";\n", i, USS (adjArray[i].Name));
                 }
                 printLevel (level);
                 fprintf (stderr, "}\n");
@@ -838,7 +838,7 @@ void PropertyMap::dumpCode( Reference< XPropertySet > rXPropSet )
 {
     Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
     Sequence< Property > props = info->getProperties ();
-    const OUString sType = CREATE_OUSTRING( "Type" );
+    const OUString sType = "Type";
 
     for (int i=0; i < props.getLength (); i++) {
 
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 29a623b533d8..926beb963455 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -95,7 +95,7 @@ void SAL_CALL UnoBinaryInputStream::skipBytes( sal_Int32 nBytesToSkip )
 sal_Int32 SAL_CALL UnoBinaryInputStream::available() throw (NotConnectedException, IOException, RuntimeException)
 {
     ensureConnected();
-    throw RuntimeException( CREATE_OUSTRING( "Functionality not supported" ), Reference< XInputStream >() );
+    throw RuntimeException( "Functionality not supported", Reference< XInputStream >() );
 }
 
 void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException)
@@ -108,7 +108,7 @@ void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, I
 void UnoBinaryInputStream::ensureConnected() const throw (NotConnectedException)
 {
     if( !mpInStrm )
-        throw NotConnectedException( CREATE_OUSTRING( "Stream closed" ), Reference< XInterface >() );
+        throw NotConnectedException( "Stream closed", Reference< XInterface >() );
 }
 
 } // namespace
@@ -193,7 +193,7 @@ OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar )
     if( rxContext.is() && rxInStrm.is() && pcCharset ) try
     {
         Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW );
-        Reference< XActiveDataSink > xDataSink( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TextInputStream" ) ), UNO_QUERY_THROW );
+        Reference< XActiveDataSink > xDataSink( xFactory->createInstance( "com.sun.star.io.TextInputStream" ), UNO_QUERY_THROW );
         xDataSink->setInputStream( rxInStrm );
         xTextStrm.set( xDataSink, UNO_QUERY_THROW );
         xTextStrm->setEncoding( OUString::createFromAscii( pcCharset ) );