[Libreoffice-commits] .: Branch 'libreoffice-3-4' - xmloff/source

[Caolán McNamara]

 xmloff/source/text/txtparai.cxx |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 15fe1596b265aff57264145c0e69d36607cc15a5
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Feb 10 17:54:03 2012 +0100

    fdo#42771: Fix crash when loading an invalid .fodt.
    
    createTextCursorByRange() likes to throw runtime exception, even though it
    just means 'we were unable to create the cursor'.
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 3a73309..fb775a7 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2034,10 +2034,16 @@ XMLParaContext::~XMLParaContext()
     xTxtImport->InsertControlCharacter( ControlCharacter::APPEND_PARAGRAPH );
 
     // create a cursor that select the whole last paragraph
-    Reference < XTextCursor > xAttrCursor(
-        xTxtImport->GetText()->createTextCursorByRange( xStart ));
-    if( !xAttrCursor.is() )
-        return; // Robust (defect file)
+    Reference < XTextCursor > xAttrCursor;
+    try {
+        xAttrCursor = xTxtImport->GetText()->createTextCursorByRange( xStart );
+        if( !xAttrCursor.is() )
+            return; // Robust (defect file)
+    } catch (uno::Exception &) {
+        // createTextCursorByRange() likes to throw runtime exception, even
+        // though it just means 'we were unable to create the cursor'
+        return;
+    }
     xAttrCursor->gotoRange( xEnd, sal_True );
 
     // xml:id for RDF metadata