sw/source/filter/ww8/docxattributeoutput.cxx | 2 +- sw/source/filter/ww8/rtfsdrexport.cxx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit d5642fe00cfd23d1470fa2062a93b30a612bbadd Author: Michael Stahl <[email protected]> Date: Thu Aug 14 00:01:42 2014 +0200 warning C4702: unreachable code that's a real bug in f6e7b94042070241cd1cfb1d7f8610fe1801b4f2 Change-Id: I46b9f6000b4c5e3b4aec44d96100cb41b6a8b41e diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 30c0596..f8f2d00 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4030,8 +4030,8 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size if ("SdtEndBefore" == aGrabBag[nProp].Name && m_bStartedCharSdt && !m_bEndCharSdt) { aGrabBag[nProp].Value >>= m_bEndCharSdt; + break; } - break; } } } commit 62f9179110482b97fa0ffe3218b3e9da9644292f Author: Michael Stahl <[email protected]> Date: Wed Aug 13 23:59:24 2014 +0200 spurious warning C4189 local variable initialized but not referenced Change-Id: I67ac7757a05dfba5724f8f73856e0a23194adaf8 diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index d8706a2..b32dae2 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -451,8 +451,9 @@ void RtfSdrExport::impl_writeGraphic() return; } OString aURLBS(OUStringToOString(sGraphicURL, RTL_TEXTENCODING_UTF8)); - const char aURLBegin[] = "vnd.sun.star.GraphicObject:"; - Graphic aGraphic = GraphicObject(aURLBS.copy(RTL_CONSTASCII_LENGTH(aURLBegin))).GetTransformedGraphic(); + Graphic aGraphic = GraphicObject( + aURLBS.copy(RTL_CONSTASCII_LENGTH("vnd.sun.star.GraphicObject:"))) + .GetTransformedGraphic(); // Export it to a stream. SvMemoryStream aStream; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
