diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-20 12:00:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-08-22 10:49:28 +0200 |
commit | e41b17ac4eec184de106d82eb70d0bc238fc0799 (patch) | |
tree | 67114648bf83378ec7786f3ea4acb8fccbdb0bf3 /svtools | |
parent | 784db67fb5920d651ec1a4369af7fd57a2da1531 (diff) |
convert svtools/source/filter/exportdialog.hxx from String to OUString
Change-Id: Ideafa9103c2d1317257e37315ff53aa9b9054c17
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/filter/exportdialog.cxx | 28 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.hxx | 26 |
2 files changed, 27 insertions, 27 deletions
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index b4cfef9f162c..d720e74b7c4f 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -509,7 +509,7 @@ Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream ) Bitmap aRet; Graphic aGraphic; GraphicFilter aFilter( sal_False ); - if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, static_cast<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*>(NULL), NULL ) == GRFILTER_OK ) + if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, static_cast<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*>(NULL), NULL ) == GRFILTER_OK ) { aRet = aGraphic.GetBitmap(); } @@ -522,7 +522,7 @@ sal_uInt32 ExportDialog::GetRawFileSize() const if ( mbIsPixelFormat ) { sal_Int32 nBitsPerPixel = 24; - String aEntry( mpLbColorDepth->GetSelectEntry() ); + OUString aEntry( mpLbColorDepth->GetSelectEntry() ); if ( ms1BitTreshold == aEntry ) nBitsPerPixel = 1; else if ( ms1BitDithered == aEntry ) @@ -629,11 +629,11 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara, get(mpBtnOK, "ok"); - maExt.ToUpperAscii(); + maExt = maExt.toAsciiUpperCase(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); + OUString aFilterConfigPath( "Office.Common/Filter/Graphic/Export/" ); mpOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); - aFilterConfigPath.Append( maExt ); + aFilterConfigPath += maExt; mpFilterOptionsItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); mnInitialResolutionUnit = mbIsPixelFormat @@ -643,7 +643,7 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara, mnMaxFilesizeForRealtimePreview = mpOptionsItem->ReadInt32(OUString("MaxFilesizeForRealtimePreview"), 0); mpFtEstimatedSize->SetText(OUString(" \n ")); - String aTitle(maExt); + OUString aTitle(maExt); aTitle += GetText(); SetText(aTitle); @@ -949,15 +949,15 @@ void ExportDialog::updateControls() sal_Int64 nRealFileSize( mpTempStream->Tell() ); if ( mbIsPixelFormat ) { - String aEst( nRealFileSize ? msEstimatedSizePix2 : msEstimatedSizePix1 ); + OUString aEst( nRealFileSize ? msEstimatedSizePix2 : msEstimatedSizePix1 ); sal_Int64 nRawFileSize( GetRawFileSize() ); - xub_StrLen nInd = aEst.Search( '%' ); - aEst.Replace( nInd, 2, ImpValueOfInKB( nRawFileSize ) ); + sal_Int32 nInd = aEst.indexOf( "%" ); + aEst = aEst.replaceAt( nInd, 2, ImpValueOfInKB( nRawFileSize ) ); if ( nRealFileSize ) { - nInd = aEst.Search( '%', nInd ); - aEst.Replace( nInd, 2, ImpValueOfInKB( nRealFileSize ) ); + nInd = aEst.indexOf( "%", nInd ); + aEst = aEst.replaceAt( nInd, 2, ImpValueOfInKB( nRealFileSize ) ); } mpFtEstimatedSize->SetText( aEst ); } @@ -965,9 +965,9 @@ void ExportDialog::updateControls() { if ( mnMaxFilesizeForRealtimePreview ) { - String aEst( msEstimatedSizeVec ); - xub_StrLen nInd = aEst.Search( '%', 0 ); - aEst.Replace( nInd, 2, ImpValueOfInKB( nRealFileSize ) ); + OUString aEst( msEstimatedSizeVec ); + sal_Int32 nInd = aEst.indexOf( "%" ); + aEst = aEst.replaceAt( nInd, 2, ImpValueOfInKB( nRealFileSize ) ); mpFtEstimatedSize->SetText( aEst ); } } diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 389a72542ade..75dec908f726 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -97,25 +97,25 @@ private: OKButton* mpBtnOK; - String msEstimatedSizePix1; - String msEstimatedSizePix2; - String msEstimatedSizeVec; - - String ms1BitTreshold; - String ms1BitDithered; - String ms4BitGrayscale; - String ms4BitColorPalette; - String ms8BitGrayscale; - String ms8BitColorPalette; - String ms24BitColor; + OUString msEstimatedSizePix1; + OUString msEstimatedSizePix2; + OUString msEstimatedSizeVec; + + OUString ms1BitTreshold; + OUString ms1BitDithered; + OUString ms4BitGrayscale; + OUString ms4BitColorPalette; + OUString ms8BitGrayscale; + OUString ms8BitColorPalette; + OUString ms24BitColor; Size maDialogSize; FilterConfigItem* mpOptionsItem; FilterConfigItem* mpFilterOptionsItem; - String maExt; - String maEstimatedSizeText; + OUString maExt; + OUString maEstimatedSizeText; sal_Int16 mnFormat; sal_Int32 mnMaxFilesizeForRealtimePreview; |