diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-20 13:08:30 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:37 +0200 |
commit | 0d586f5b7e0e0cd7ee66790d3e20f8902096ab00 (patch) | |
tree | 208206c2f1d95a751349176a6f3cd7b92fbc6d78 /filter | |
parent | 9dc41e228dd60c60a4364d26270c9769d2939ded (diff) |
convert leftovers in filter module from String to OUString
Change-Id: If8954c39fec724066d46fe5d8c7e486d9bf6e955
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/flash/swfwriter1.cxx | 8 | ||||
-rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 34ef03344d01..5b2dce15f52c 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/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; diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 3e2ad216e0f3..76ec162d21a2 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/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 ); diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index 407dda8d6ebf..b2055b35ed42 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/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 diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 3a346a826c19..a8515bbb2401 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/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 ); |