convert leftovers in filter module from String to OUString

Change-Id: If8954c39fec724066d46fe5d8c7e486d9bf6e955

filter/source/flash/swfwriter1.cxx

@@ -862,7 +862,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
         aFilterData[0].Value <<= nJPEGQualityLevel;
     }
 
-    if( aFilter.ExportGraphic( aGraphic, String(), aDstStm,
+    if( aFilter.ExportGraphic( aGraphic, OUString(), aDstStm,
                                 aFilter.GetExportFormatNumberForShortName( OUString(JPG_SHORTNAME) ), &aFilterData ) == ERRCODE_NONE )
     {
         pJpgData = reinterpret_cast<const sal_uInt8*>(aDstStm.GetData());
@@ -1773,7 +1773,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
             case( META_TEXT_ACTION ):
             {
                 const MetaTextAction* pA = (const MetaTextAction*) pAction;
-                Impl_writeText( pA->GetPoint(), String( pA->GetText(), pA->GetIndex(), pA->GetLen() ), NULL, 0);
+                Impl_writeText( pA->GetPoint(),  pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), NULL, 0);
             }
             break;
 
@@ -1787,14 +1787,14 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
             case( META_TEXTARRAY_ACTION ):
             {
                 const MetaTextArrayAction*  pA = (const MetaTextArrayAction*) pAction;
-                Impl_writeText( pA->GetPoint(), String( pA->GetText(), pA->GetIndex(), pA->GetLen() ), pA->GetDXArray(), 0 );
+                Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), pA->GetDXArray(), 0 );
             }
             break;
 
             case( META_STRETCHTEXT_ACTION ):
             {
                 const MetaStretchTextAction* pA = (const MetaStretchTextAction*) pAction;
-                Impl_writeText( pA->GetPoint(), String( pA->GetText(), pA->GetIndex(), pA->GetLen() ), NULL, pA->GetWidth() );
+                Impl_writeText( pA->GetPoint(), pA->GetText().copy( pA->GetIndex(), pA->GetLen() ), NULL, pA->GetWidth() );
             }
             break;
 

filter/source/graphicfilter/eos2met/eos2met.cxx

@@ -1883,7 +1883,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                 METSetChrCellSize(aGDIFont.GetSize());
                 METSetChrAngle( nOrientation = aGDIFont.GetOrientation() );
                 METSetChrSet(FindChrSet(aGDIFont));
-                aStr=String(pA->GetText(),pA->GetIndex(),pA->GetLen());
+                aStr = pA->GetText().copy(pA->GetIndex(),pA->GetLen());
 
                 if( pA->GetDXArray()!=NULL )
                 {
@@ -1939,7 +1939,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
                 METSetChrCellSize(aGDIFont.GetSize());
                 METSetChrAngle( nOrientation = aGDIFont.GetOrientation() );
                 METSetChrSet(FindChrSet(aGDIFont));
-                aStr=String(pA->GetText(),pA->GetIndex(),pA->GetLen());
+                aStr = pA->GetText().copy(pA->GetIndex(),pA->GetLen());
                 pDXAry = new sal_Int32[aStr.getLength()];
                 nNormSize = aVDev.GetTextArray( aStr, pDXAry );
 

filter/source/graphicfilter/icgm/cgm.cxx

@@ -763,7 +763,7 @@ SvStream& operator>>( SvStream& rOStm, CGM& /*rCGM*/ )
 //================== GraphicImport - the exported function ================
 
 extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL
-ImportCGM( String& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar )
+ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar )
 {
 
     sal_uInt32  nStatus = 0;            // retvalue == 0 -> ERROR

filter/source/msfilter/svdfppt.cxx

@@ -1670,7 +1670,7 @@ sal_Bool PPTConvertOCXControls::InsertControl(
         if( rServiceFactory.is() )
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xCreate = rServiceFactory
-                ->createInstance(String( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ControlShape" ) ) );
+                ->createInstance( "com.sun.star.drawing.ControlShape" );
             if( xCreate.is() )
             {
                 xShape = ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >(xCreate, ::com::sun::star::uno::UNO_QUERY);
@@ -3711,7 +3711,7 @@ void PPTNumberFormatCreator::ImplGetNumberFormat( SdrPowerPointImport& rManager,
     PptFontEntityAtom* pAtom = rManager.GetFontEnityAtom( nBulletFont );
     if ( pAtom )
     {
-        CharSet eCharSet( pAtom->eCharSet );
+        rtl_TextEncoding eCharSet( pAtom->eCharSet );
         aFont.SetName( pAtom->aName );
         aFont.SetCharSet( eCharSet );
         aFont.SetFamily( pAtom->eFamily );

include/filter/msfilter/svdfppt.hxx

@@ -265,7 +265,7 @@ struct PptFontEntityAtom
     sal_uInt8           lfQuality;
 
     sal_uInt32          nUniqueFontId;          // not used anymore
-    CharSet             eCharSet;
+    rtl_TextEncoding    eCharSet;
     FontFamily          eFamily;
     FontPitch           ePitch;
     sal_Bool            bAvailable;
@@ -406,7 +406,7 @@ protected:
     sal_uInt32          nStreamLen;
     sal_uInt16          nTextStylesIndex;
 
-    CharSet             eCharSetSystem;
+    rtl_TextEncoding    eCharSetSystem;
 
     sal_Bool            bWingdingsChecked       : 1;
     sal_Bool            bWingdingsAvailable     : 1;