[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Caolán McNamara]

 sw/source/filter/xml/xmltexti.cxx |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 2fc412538612d9419d5b27a8ad6be2bc51e7b8c3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 20 16:17:07 2015 +0000

    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 at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 8f91b79..fae4cd6 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();
             }