sw/source/filter/html/htmlflywriter.cxx | 4 ++-- sw/source/filter/html/htmlplug.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 707c6c233808133eee4c0ddfe3045ba0b2b2b4dd Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Mar 23 15:44:04 2016 +0100 loplugin:stringconstant Change-Id: I82c0f91dcc20af28decd6d6eb7cf5f0f946f0987 diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 1053a39..1281231 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -1733,7 +1733,7 @@ static Writer & OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& r GraphicURL = *rHTMLWrt.GetOrigFileName(); if( aGraphic.GetType() == GRAPHIC_NONE || XOutBitmap::WriteGraphic( aGraphic, GraphicURL, - OUString("JPG"), + "JPG", (XOUTBMP_USE_GIF_IF_POSSIBLE| XOUTBMP_USE_NATIVE_IF_POSSIBLE) ) != 0 ) { @@ -1803,7 +1803,7 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rF MapMode( MAP_TWIP ), MapMode( MAP_100TH_MM )); sal_uInt16 nErr = XOutBitmap::WriteGraphic( pGrfNd->GetGrf(), aGraphicURL, - OUString("JPG"), nFlags, &aMM100Size ); + "JPG", nFlags, &aMM100Size ); if( nErr ) { rHTMLWrt.m_nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE; diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index f85ab2e..90dd59e 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1323,7 +1323,7 @@ Writer& OutHTML_FrameFormatOLENodeGrf( Writer& rWrt, const SwFrameFormat& rFrame aGraphicURL = *pTempFileName; sal_uInt16 nErr = XOutBitmap::WriteGraphic( aGraphic, aGraphicURL, - OUString("JPG"), + "JPG", (XOUTBMP_USE_GIF_IF_POSSIBLE | XOUTBMP_USE_NATIVE_IF_POSSIBLE) ); if( nErr ) // fehlerhaft, da ist nichts auszugeben _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits