diff options
| -rw-r--r-- | include/svx/xoutbmp.hxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlexp2.cxx | 4 | ||||
| -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 |
6 files changed, 17 insertions, 18 deletions
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 3bb51cff44ca..bccf758e199a 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -51,12 +51,12 @@ public: static Graphic MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags ); static Animation MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr ); - static sal_uInt16 WriteGraphic( const Graphic& rGraphic, String& rFileName, - const String& rFilterName, const sal_uIntPtr nFlags = 0L, + static sal_uInt16 WriteGraphic( const Graphic& rGraphic, OUString& rFileName, + const OUString& rFilterName, const sal_uIntPtr nFlags = 0L, const Size* pMtfSize_100TH_MM = NULL ); static sal_uLong GraphicToBase64(const Graphic& rGraphic,OUString& rOUString); - static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, + static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, GraphicFilter& rFilter, const sal_uInt16 nFormat, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 091678b0010b..b140c03ebf63 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -577,8 +577,10 @@ void ScHTMLExport::WriteBody() { // Save graphic as (JPG) file aGrfNm = aStreamPath; - sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm, - String("JPG"), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); + OUString aTmp(aGrfNm); + sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, aTmp, + OUString("JPG"), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); + aGrfNm = aTmp; if( !nErr ) // Contains errors, as we have nothing to output { aGrfNm = URIHelper::SmartRel2Abs( diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index a2a5e704a262..37edba56a813 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -190,10 +190,10 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf, if( aStreamPath.Len() > 0 ) { // Save as a PNG - String aGrfNm( aStreamPath ); + OUString aGrfNm( aStreamPath ); nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE; sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm, - String( "PNG" ), nXOutFlags ); + OUString( "PNG" ), nXOutFlags ); // If it worked, create a URL for the IMG tag if( !nErr ) 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)) { |