[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 7 01:14:17 PST 2013
sw/source/filter/ww8/rtfattributeoutput.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7bdf322a45505af8e23397bbeb08f7e21cb88c09
Author: LeMoyne Castle <lemoyne.castle at gmail.com>
Date: Fri Jan 4 09:32:12 2013 -0700
Fix for rtfexport subsequenttest
was re-using previous data buffer in later write to file
fixes segfault in rtfexport subsequenttest
should correct WMF image garbling, rtf breakage
Change-Id: I9a296da5cfd29dc88c8e3e1352a6e9b38aeba4ef
Reviewed-on: https://gerrit.libreoffice.org/1545
Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
Tested-by: Miklos Vajna <vmiklos at suse.cz>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 36d1cea..9a65c42 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3347,7 +3347,7 @@ void RtfAttributeOutput::FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, S
OSL_FAIL("failed to export the graphic");
aWmfStream.Seek(STREAM_SEEK_TO_END);
nSize = aWmfStream.Tell();
- pGraphicAry = (sal_uInt8*)aStream.GetData();
+ pGraphicAry = (sal_uInt8*)aWmfStream.GetData();
m_aRunText->append(ExportPICT( pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, m_rExport ));
m_aRunText->append("}"); // nonshppict
}
More information about the Libreoffice-commits
mailing list