diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-20 10:51:58 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-22 14:25:15 +0000 |
| commit | e13a3d566ecc34a46e037aca1b2d70e58501e422 (patch) | |
| tree | ea7c6a3633a7a9ac33375a8e157ece0befe2e4a4 /filter | |
| parent | df70e3fee18835303cff17294b1fd21b6dd9146e (diff) | |
fdo#38838 Some removal/replacement of the String/UniString with OUString
Also used the new OUString::number(...) methods.
Change-Id: I3174c43d56d1ae359901bb8a13fe0096f2c74808
Reviewed-on: https://gerrit.libreoffice.org/1766
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 23 | ||||
| -rw-r--r-- | filter/source/pdf/impdialog.cxx | 3 |
2 files changed, 12 insertions, 14 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 17c55e2c4415..6ad64ebf3c7e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -269,8 +269,8 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const { if ( IsProperty( i ) ) { - OString aString("Prop_adjustValue" + OString::valueOf((static_cast<sal_Int32>( ( i - DFF_Prop_adjustValue ) + 1 ) )) + - ":" + OString::valueOf(static_cast<sal_Int32>(GetPropertyValue(i)))); + OString aString("Prop_adjustValue" + OString::number( ( i - DFF_Prop_adjustValue ) + 1 ) + + ":" + OString::number(GetPropertyValue(i)) ); pOut->WriteLine(aString); } } @@ -288,7 +288,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const { pOut->WriteLine( "" ); OStringBuffer aDesc("Property:" + OString::number(i) + - " Size:" + OString::valueOf(nLen)); + " Size:" + OString::number(nLen)); pOut->WriteLine(aDesc.makeStringAndClear()); sal_Int16 nNumElem, nNumElemMem, nNumSize; rIn >> nNumElem >> nNumElemMem >> nNumSize; @@ -332,7 +332,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const else { OString aString("Property" + OString::number(i) + - ":" + OString::valueOf(static_cast<sal_Int32>(GetPropertyValue(i)))); + ":" + OString::number(GetPropertyValue(i))); pOut->WriteLine(aString); } } @@ -6126,16 +6126,15 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, // extract graphics from ole storage into "dbggfxNNN.*" static sal_Int32 nGrfCount; - String aFileName( "dbggfx" ); - aFileName.Append( String::CreateFromInt32( nGrfCount++ ) ); + OUString aFileName = "dbggfx" + OUString::number( nGrfCount++ ); switch( nInst &~ 1 ) { - case 0x216 : aFileName.Append( ".wmf" ); break; - case 0x3d4 : aFileName.Append( ".emf" ); break; - case 0x542 : aFileName.Append( ".pct" ); break; - case 0x46a : aFileName.Append( ".jpg" ); break; - case 0x6e0 : aFileName.Append( ".png" ); break; - case 0x7a8 : aFileName.Append( ".bmp" ); break; + case 0x216 : aFileName += ".wmf"; break; + case 0x3d4 : aFileName += ".emf"; break; + case 0x542 : aFileName += ".pct"; break; + case 0x46a : aFileName += ".jpg"; break; + case 0x6e0 : aFileName += ".png"; break; + case 0x7a8 : aFileName += ".bmp"; break; } rtl::OUString aURLStr; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 8713b6703c77..43890deae91a 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -585,8 +585,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent maCbReduceImageResolution.SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl ) ); const sal_Bool bReduceImageResolution = paParent->mbReduceImageResolution; maCbReduceImageResolution.Check( bReduceImageResolution ); - String aStrRes( String::CreateFromInt32( paParent->mnMaxImageResolution ) ); - aStrRes.Append( String( RTL_CONSTASCII_USTRINGPARAM( " DPI" ) ) ); + OUString aStrRes = OUString::number( paParent->mnMaxImageResolution ) + " DPI"; maCoReduceImageResolution.SetText( aStrRes ); maCoReduceImageResolution.Enable( bReduceImageResolution ); maCbWatermark.SetToggleHdl( LINK( this, ImpPDFTabGeneralPage, ToggleWatermarkHdl ) ); |