summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-20 16:17:07 +0000
committerMichael Stahl <mstahl@redhat.com>2015-01-21 12:34:22 +0000
commit2fc412538612d9419d5b27a8ad6be2bc51e7b8c3 (patch)
tree19b68d41231270816922a7b3a86411e4f15cf0ac
parentc147a110d6d9bc1de0ebf79638751dd360317fc4 (diff)
Resolves: fdo#84943 make fodt non crashy like odt for formulas inside shapes
where odt checks for a null pTxtCrsr and skips the object and fodt just ploughed ahead. i.e. make fodt equally useless as odt (fdo#84942) (cherry picked from commit 4345a3de0e5a600685fef5dc9fa422fe6849a0a3) Conflicts: sw/source/filter/xml/xmltexti.cxx Change-Id: I915cc1f7c065ea83377e895a932636c82698cf1f Reviewed-on: https://gerrit.libreoffice.org/14058 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/source/filter/xml/xmltexti.cxx18
1 files changed, 11 insertions, 7 deletions
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 8f91b79639e0..fae4cd6de3b9 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -230,7 +230,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
OSL_ENSURE( xCrsrTunnel.is(), "missing XUnoTunnel for Cursor" );
OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper * >(
sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() )));
- OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" );
+ SAL_WARN_IF(!pTxtCrsr, "sw.uno", "SwXTextCursor missing");
SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport );
SfxItemSet aItemSet( pDoc->GetAttrPool(), RES_FRMATR_BEGIN,
@@ -284,12 +284,16 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
lcl_setObjectVisualArea( xObj, nAspect, aTwipSize, MAP_TWIP );
}
- pFrmFmt = pDoc->Insert( *pTxtCrsr->GetPaM(),
- ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
- &aItemSet,
- NULL,
- NULL );
- pOLENd = lcl_GetOLENode( pFrmFmt );
+ if( pTxtCrsr )
+ {
+ pFrmFmt = pDoc->Insert( *pTxtCrsr->GetPaM(),
+ ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ),
+ &aItemSet,
+ NULL,
+ NULL );
+ pOLENd = lcl_GetOLENode( pFrmFmt );
+ }
+
if( pOLENd )
aObjName = pOLENd->GetOLEObj().GetCurrentPersistName();
}