no longer needed CREATE_STRING macro

Change-Id: Idd37b3787bf8e4b547b7e861cebe0fcadbd25bbe

15 files changed, 37 insertions, 40 deletions

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 95ce2e3b2db6..c1e160739483 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -155,14 +155,14 @@ static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument,
     if( bBiff8 )
     {
         aStrmName = EXC_STREAM_WORKBOOK;
-        aClipName = CREATE_STRING( "Biff8" );
-        aClassName = CREATE_STRING( "Microsoft Excel 97-Tabelle" );
+        aClipName = "Biff8";
+        aClassName = "Microsoft Excel 97-Tabelle";
     }
     else
     {
         aStrmName = EXC_STREAM_BOOK;
-        aClipName = CREATE_STRING( "Biff5" );
-        aClassName = CREATE_STRING( "Microsoft Excel 5.0-Tabelle" );
+        aClipName = "Biff5";
+        aClassName = "Microsoft Excel 5.0-Tabelle";
     }
 
     // open the "Book"/"Workbook" stream
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 6aa95aebbd30..3cb43671b3c4 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -167,7 +167,7 @@ ExcelToSc::~ExcelToSc()
 
 void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis )
 {
-    aPool.Store( CREATE_STRING( "Dummy()" ) );
+    aPool.Store( String("Dummy()") );
     aPool >> aStack;
     pErgebnis = aPool[ aStack.Get() ];
 }
@@ -206,7 +206,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
 
     if( nFormulaLen == 0 )
     {
-        aPool.Store( CREATE_STRING( "-/-" ) );
+        aPool.Store( String("-/-") );
         aPool >> aStack;
         pErgebnis = aPool[ aStack.Get() ];
         return ConvOK;
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 34bda87e8c60..4cd9dce56c02 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -164,7 +164,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
 
     if( nFormulaLen == 0 )
     {
-        aPool.Store( CREATE_STRING( "-/-" ) );
+        aPool.Store( String( "-/-" ) );
         aPool >> aStack;
         rpTokArray = aPool[ aStack.Get() ];
         return ConvOK;
@@ -1293,7 +1293,7 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea
 
     if (nFormulaLen == 0)
     {
-        aPool.Store(CREATE_STRING("-/-"));
+        aPool.Store(String("-/-"));
         aPool >> aStack;
         rpArray = aPool[aStack.Get()];
         return ConvOK;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 6a18478e9e30..b391a07689df 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -540,7 +540,7 @@ XclExpOcxControlObj::XclExpOcxControlObj( XclExpObjectManager& rObjMgr, Referenc
     // meta file
     //! TODO - needs check
     Reference< XPropertySet > xShapePS( xShape, UNO_QUERY );
-    if( xShapePS.is() && aPropOpt.CreateGraphicProperties( xShapePS, CREATE_STRING( "MetaFile" ), false ) )
+    if( xShapePS.is() && aPropOpt.CreateGraphicProperties( xShapePS, String( "MetaFile" ), false ) )
     {
         sal_uInt32 nBlipId;
         if( aPropOpt.GetOpt( ESCHER_Prop_pib, nBlipId ) )
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index a9ff73ae6187..5b6e37ab8115 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1058,7 +1058,7 @@ sal_uInt16 XclExpExtNameBuffer::InsertDde(
             // create the leading 'StdDocumentName' EXTERNNAME record
             if( maNameList.IsEmpty() )
                 AppendNew( new XclExpExtNameDde(
-                    GetRoot(), CREATE_STRING( "StdDocumentName" ), EXC_EXTN_EXPDDE_STDDOC ) );
+                    GetRoot(), String("StdDocumentName"), EXC_EXTN_EXPDDE_STDDOC ) );
 
             // try to find DDE result array, but create EXTERNNAME record without them too
             const ScMatrix* pScMatrix = GetDoc().GetDdeLinkResultMatrix( nPos );
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 7f8cc941bfb5..f783eed1524f 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1111,7 +1111,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn
     rPropSet.SetProperty( EXC_CHPROP_LABEL, aPointLabel );
     String aSep = mxLabelProps ? mxLabelProps->maSeparator : OUString('\n');
     if( aSep.Len() == 0 )
-        aSep = CREATE_STRING( "; " );
+        aSep = "; ";
     rPropSet.SetStringProperty( EXC_CHPROP_LABELSEPARATOR, aSep );
 
     // text properties of attached label
@@ -3547,7 +3547,7 @@ void XclImpChAxesSet::Finalize()
 
         // finalize axis titles
         const XclImpChText* pDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_AXISTITLE );
-        String aAutoTitle = CREATE_STRING( "Axis Title" );
+        String aAutoTitle("Axis Title");
         lclFinalizeTitle( mxXAxisTitle, pDefText, aAutoTitle );
         lclFinalizeTitle( mxYAxisTitle, pDefText, aAutoTitle );
         lclFinalizeTitle( mxZAxisTitle, pDefText, aAutoTitle );
@@ -4146,7 +4146,7 @@ void XclImpChChart::FinalizeTitle()
             if( !mxTitle )
                 mxTitle.reset( new XclImpChText( GetChRoot() ) );
             if( aAutoTitle.Len() == 0 )
-                aAutoTitle = CREATE_STRING( "Chart Title" );
+                aAutoTitle = "Chart Title";
         }
     }
 
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index ede6c114fb35..bfdd175f62ce 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -4117,27 +4117,27 @@ void XclImpSheetDrawing::ReadNote8( XclImpStream& rStrm )
 XclImpObjectManager::XclImpObjectManager( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot )
 {
-    maDefObjNames[ EXC_OBJTYPE_GROUP ]          = CREATE_STRING( "Group" );
+    maDefObjNames[ EXC_OBJTYPE_GROUP ]          = "Group";
     maDefObjNames[ EXC_OBJTYPE_LINE ]           = ScGlobal::GetRscString( STR_SHAPE_LINE );
     maDefObjNames[ EXC_OBJTYPE_RECTANGLE ]      = ScGlobal::GetRscString( STR_SHAPE_RECTANGLE );
     maDefObjNames[ EXC_OBJTYPE_OVAL ]           = ScGlobal::GetRscString( STR_SHAPE_OVAL );
-    maDefObjNames[ EXC_OBJTYPE_ARC ]            = CREATE_STRING( "Arc" );
-    maDefObjNames[ EXC_OBJTYPE_CHART ]          = CREATE_STRING( "Chart" );
-    maDefObjNames[ EXC_OBJTYPE_TEXT ]           = CREATE_STRING( "Text" );
+    maDefObjNames[ EXC_OBJTYPE_ARC ]            = "Arc";
+    maDefObjNames[ EXC_OBJTYPE_CHART ]          = "Chart";
+    maDefObjNames[ EXC_OBJTYPE_TEXT ]           = "Text";
     maDefObjNames[ EXC_OBJTYPE_BUTTON ]         =  ScGlobal::GetRscString( STR_FORM_BUTTON );
-    maDefObjNames[ EXC_OBJTYPE_PICTURE ]        = CREATE_STRING( "Picture" );
-    maDefObjNames[ EXC_OBJTYPE_POLYGON ]        = CREATE_STRING( "Freeform" );
+    maDefObjNames[ EXC_OBJTYPE_PICTURE ]        = "Picture";
+    maDefObjNames[ EXC_OBJTYPE_POLYGON ]        = "Freeform";
     maDefObjNames[ EXC_OBJTYPE_CHECKBOX ]       = ScGlobal::GetRscString( STR_FORM_CHECKBOX );
     maDefObjNames[ EXC_OBJTYPE_OPTIONBUTTON ]   = ScGlobal::GetRscString( STR_FORM_OPTIONBUTTON );
-    maDefObjNames[ EXC_OBJTYPE_EDIT ]           = CREATE_STRING( "Edit Box" );
+    maDefObjNames[ EXC_OBJTYPE_EDIT ]           = "Edit Box";
     maDefObjNames[ EXC_OBJTYPE_LABEL ]          = ScGlobal::GetRscString( STR_FORM_LABEL );
-    maDefObjNames[ EXC_OBJTYPE_DIALOG ]         = CREATE_STRING( "Dialog Frame" );
+    maDefObjNames[ EXC_OBJTYPE_DIALOG ]         = "Dialog Frame";
     maDefObjNames[ EXC_OBJTYPE_SPIN ]           = ScGlobal::GetRscString( STR_FORM_SPINNER );
     maDefObjNames[ EXC_OBJTYPE_SCROLLBAR ]      = ScGlobal::GetRscString( STR_FORM_SCROLLBAR );
     maDefObjNames[ EXC_OBJTYPE_LISTBOX ]        = ScGlobal::GetRscString( STR_FORM_LISTBOX );
     maDefObjNames[ EXC_OBJTYPE_GROUPBOX ]       = ScGlobal::GetRscString( STR_FORM_GROUPBOX );
     maDefObjNames[ EXC_OBJTYPE_DROPDOWN ]       = ScGlobal::GetRscString( STR_FORM_DROPDOWN );
-    maDefObjNames[ EXC_OBJTYPE_NOTE ]           = CREATE_STRING( "Comment" );
+    maDefObjNames[ EXC_OBJTYPE_NOTE ]           = "Comment";
     maDefObjNames[ EXC_OBJTYPE_DRAWING ]        = ScGlobal::GetRscString( STR_SHAPE_AUTOSHAPE );
 }
 
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index f8c613cf87e5..6e6d3e16a47d 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -82,7 +82,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
     mrMedium( rMedium ),
     mxRootStrg( xRootStrg ),
     mrDoc( rDoc ),
-    maDefPassword( CREATE_STRING( "VelvetSweatshop" ) ),
+    maDefPassword( "VelvetSweatshop" ),
     meTextEnc( eTextEnc ),
     meSysLang( Application::GetSettings().GetLanguageTag().getLanguageType() ),
     meDocLang( Application::GetSettings().GetLanguageTag().getLanguageType() ),
@@ -102,7 +102,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
 {
  maUserName = SvtUserOptions().GetLastName();
     if( maUserName.Len() == 0 )
-        maUserName = CREATE_STRING( "Calc" );
+        maUserName = "Calc";
 
     switch( ScGlobal::GetDefaultScriptType() )
     {
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 1517c8109084..889c56c1247f 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -578,7 +578,7 @@ void ScHTMLExport::WriteBody()
                 // Grafik als (JPG-)File speichern
                 aGrfNm = aStreamPath;
                 sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm,
-                    CREATE_STRING( "JPG" ), XOUTBMP_USE_NATIVE_IF_POSSIBLE );
+                    String("JPG"), XOUTBMP_USE_NATIVE_IF_POSSIBLE );
                 if( !nErr )     // fehlerhaft, da ist nichts auszugeben
                 {
                     aGrfNm = URIHelper::SmartRel2Abs(
@@ -841,7 +841,7 @@ void ScHTMLExport::WriteTables()
         }
 
         if ( bAll )
-            OUT_COMMENT( CREATE_STRING( "**************************************************************************" ) );
+            OUT_COMMENT( String("**************************************************************************") );
     }
 }
 
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 67f7642a1f81..a2a5e704a262 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -193,7 +193,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf,
             String aGrfNm( aStreamPath );
             nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE;
             sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm,
-                CREATE_STRING( "PNG" ), nXOutFlags );
+                String( "PNG" ), nXOutFlags );
 
             // If it worked, create a URL for the IMG tag
             if( !nErr )
diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx
index d8e093ca71a5..bd84cedb72e4 100644
--- a/sc/source/filter/inc/excdefs.hxx
+++ b/sc/source/filter/inc/excdefs.hxx
@@ -59,8 +59,8 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL     = 0x06;
 
 // defines for change tracking ================================================
 
-#define EXC_STREAM_USERNAMES        CREATE_STRING( "User Names" )
-#define EXC_STREAM_REVLOG           CREATE_STRING( "Revision Log" )
+#define EXC_STREAM_USERNAMES        String( "User Names" )
+#define EXC_STREAM_REVLOG           String( "Revision Log" )
 
 // opcodes
 #define EXC_CHTR_OP_COLFLAG         0x0001
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index cfa80fe86dc4..e89685c83aa9 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -34,9 +34,6 @@
 
 // Common macros ==============================================================
 
-/** Expands to a temporary String, created from an ASCII character array. */
-#define CREATE_STRING( ascii )      String( RTL_CONSTASCII_USTRINGPARAM( ascii ) )
-
 // items and item sets --------------------------------------------------------
 
 /** Expands to the item (with type 'itemtype') with Which-ID 'which'. */
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index 2dd3a02ff154..f8ccaeca9e3b 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -76,13 +76,13 @@ const SCTAB SCTAB_GLOBAL                    = SCTAB_MAX;        /// A Calc sheet
 
 // Storage/stream names -------------------------------------------------------
 
-#define EXC_STORAGE_OLE_LINKED              CREATE_STRING( "LNK" )
-#define EXC_STORAGE_OLE_EMBEDDED            CREATE_STRING( "MBD" )
-#define EXC_STORAGE_VBA_PROJECT             CREATE_STRING( "_VBA_PROJECT_CUR" )
+#define EXC_STORAGE_OLE_LINKED              String( "LNK" )
+#define EXC_STORAGE_OLE_EMBEDDED            String( "MBD" )
+#define EXC_STORAGE_VBA_PROJECT             String( "_VBA_PROJECT_CUR" )
 
-#define EXC_STREAM_BOOK                     CREATE_STRING( "Book" )
-#define EXC_STREAM_WORKBOOK                 CREATE_STRING( "Workbook" )
-#define EXC_STREAM_CTLS                     CREATE_STRING( "Ctls" )
+#define EXC_STREAM_BOOK                     String( "Book" )
+#define EXC_STREAM_WORKBOOK                 String( "Workbook" )
+#define EXC_STREAM_CTLS                     String( "Ctls" )
 
 // Encoded URLs ---------------------------------------------------------------
 
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index 364fed962601..eea36a8a94ef 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -41,7 +41,7 @@ class XclExpStream;
 
 // misc -----------------------------------------------------------------------
 
-#define EXC_STORAGE_PTCACHE         CREATE_STRING( "_SX_DB_CUR" )
+#define EXC_STORAGE_PTCACHE         String( "_SX_DB_CUR" )
 
 // strings
 const sal_uInt16 EXC_PT_NOSTRING            = 0xFFFF;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 4adc31d6cc5a..2e752fcce6c7 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -75,7 +75,7 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum
     if( pLotusRoot->eFirstType == Lotus_WK3 )
     {// versuchen *.FM3-File zu laden
         INetURLObject aURL( rMedium.GetURLObject() );
-        aURL.setExtension( CREATE_STRING( "FM3" ) );
+        aURL.setExtension( "FM3" );
         SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_STD_READ );
         pStream = aMedium.GetInStream();
         if ( pStream )