oox/source/core/contexthandler2.cxx | 2 ++ oox/source/drawingml/shape.cxx | 3 ++- sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx |binary 3 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit fee379666a068d27c25e0ecfd763e85b0f3c59f2 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Nov 26 15:37:48 2013 +0100 oox: avoid crash in ContextHandler2Helper::processCollectedChars() Change-Id: Ie70c9914745364c7f2beb3cb84a610ec919a950c diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index 9ac94e8..9c7a820 100644 --- a/oox/source/core/contexthandler2.cxx +++ b/oox/source/core/contexthandler2.cxx @@ -166,6 +166,8 @@ void ContextHandler2Helper::popElementInfo() void ContextHandler2Helper::processCollectedChars() { OSL_ENSURE( !mxContextStack->empty(), "ContextHandler2Helper::processCollectedChars - no context info" ); + if (mxContextStack->empty()) + return; ElementInfo& rInfo = mxContextStack->back(); if( !rInfo.maChars.isEmpty() ) { diff --git a/sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx b/sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx index 897dcbc..b2fd265 100755 Binary files a/sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx and b/sw/qa/extras/ooxmlimport/data/textbox-wps-only.docx differ commit c7069898e18f26c132c80cc53f69eb9fb934c154 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Nov 26 14:32:21 2013 +0100 DOCX drawingML shape import: no need to add TextFrames to the drawpage As (not) done for the VML import in Drawing::createAndInsertXShape() already. Change-Id: Ib4eac941a46e09df6b5363e8c7eeacc2e6dbac6d diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index f93a4c4..aaf7128 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -508,7 +508,8 @@ Reference< XShape > Shape::createAndInsert( if( xNamed.is() ) xNamed->setName( msName ); } - rxShapes->add( mxShape ); + if (aServiceName != "com.sun.star.text.TextFrame") + rxShapes->add( mxShape ); if ( mbHidden || mbHiddenMasterShape ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits