diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-29 14:58:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:09 +0200 |
| commit | dfbb4009f895a876041c8848100a3bada1ba44fc (patch) | |
| tree | cff85aedf03a3c7a5b6b01abe0d24a3243cf3855 /svx | |
| parent | 863faa0cf9d71bf714c648537858b6adf888f8ec (diff) | |
convert include/svx/xoutbmp.hxx from String to OUString
Change-Id: Idfb879c75cce06d9be4459f054169926a56b0199
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/core/extedit.cxx | 9 | ||||
| -rw-r--r-- | svx/source/core/graphichelper.cxx | 4 | ||||
| -rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index bcc79e91a9cc..f7721cd1a0ce 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -102,15 +102,14 @@ void ExternalToolEdit::Edit( GraphicObject* pGraphicObject ) GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nFilter(rGraphicFilter.GetExportFormatNumber(fExtension)); - String aFilter(rGraphicFilter.GetExportFormatShortName(nFilter)); - String sPath(aTempFileName); + OUString aFilter(rGraphicFilter.GetExportFormatShortName(nFilter)); // Write the Graphic to the file now - XOutBitmap::WriteGraphic(aGraphic, sPath, aFilter, XOUTBMP_USE_NATIVE_IF_POSSIBLE | XOUTBMP_DONT_EXPAND_FILENAME); + XOutBitmap::WriteGraphic(aGraphic, aTempFileName, aFilter, XOUTBMP_USE_NATIVE_IF_POSSIBLE | XOUTBMP_DONT_EXPAND_FILENAME); - // There is a possiblity that sPath extnesion might have been changed if the + // There is a possiblity that sPath extension might have been changed if the // provided extension is not writable - m_aFileName = OUString(sPath); + m_aFileName = aTempFileName; //Create a thread diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index 5ff276636447..7c571e4fdbfa 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -187,9 +187,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString& } OUString aFilter( rGraphicFilter.GetExportFormatShortName( nFilter ) ); - String aFilterString( aFilter ); - String aPathString( sPath ); - XOutBitmap::WriteGraphic( rGraphic, aPathString, aFilterString, + XOutBitmap::WriteGraphic( rGraphic, sPath, aFilter, XOUTBMP_DONT_EXPAND_FILENAME | XOUTBMP_DONT_ADD_EXTENSION | XOUTBMP_USE_NATIVE_IF_POSSIBLE ); diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index d386c36763db..35d32bb241d7 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -113,8 +113,8 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nM return aRetGraphic; } -sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, - const String& rFilterName, const sal_uIntPtr nFlags, +sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName, + const OUString& rFilterName, const sal_uIntPtr nFlags, const Size* pMtfSize_100TH_MM ) { if( rGraphic.GetType() != GRAPHIC_NONE ) @@ -147,7 +147,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, if(aSvgDataPtr.get() && aSvgDataPtr->getSvgDataArrayLength() - && rFilterName.EqualsIgnoreCaseAscii("svg")) + && rFilterName.equalsIgnoreAsciiCase("svg")) { if(!(nFlags & XOUTBMP_DONT_ADD_EXTENSION)) { |