oox/source/vml/vmlshape.cxx | 2 +- sw/source/filter/ww8/docxattributeoutput.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 9eaf9877f38f3c9fea3d292015a875052f20d2ec Author: Miklos Vajna <[email protected]> Date: Fri Sep 27 13:52:42 2013 +0200 DOCX export: check for AutoFmt which id before trying to access it Change-Id: If30f1df55e426b32fd7ef1278fe5b1cf77823f87 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 42d178a..1eb94a1 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -326,7 +326,7 @@ bool lcl_checkFrameBtlr(SwNode* pStartNode, sax_fastparser::FastAttributeList* p SwTxtAttr* pTxtAttr = pTxtNode->GetSwpHints().GetStart(0); - if (!pTxtAttr) + if (!pTxtAttr || pTxtAttr->Which() != RES_TXTATR_AUTOFMT) return false; boost::shared_ptr<SfxItemSet> pItemSet = pTxtAttr->GetAutoFmt().GetStyleHandle(); commit e06907afab0c80557465cce64c2157f611e9f2b5 Author: Miklos Vajna <[email protected]> Date: Fri Sep 27 13:52:00 2013 +0200 oox: fix off-by-one error in SimpleShape::implConvertAndInsert() Change-Id: I52741c344fc04b82db650927e4223dc325afabdf diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index b50551d..a9ef5f8 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -567,7 +567,7 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes { sal_Int32 nLength = aGrabBag.getLength(); aGrabBag.realloc(nLength + 1); - aGrabBag[nLength + 1] = aPair; + aGrabBag[nLength] = aPair; } else { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
