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

Caolán McNamara caolanm at redhat.com
Thu Jun 18 05:12:17 PDT 2015


 sfx2/source/appl/appopen.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c6ae5e6bb11e0cb810df61a888e62dde831eb60d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 16 09:29:39 2015 +0100

    Resolves: tdf#88911 Crash when dragging unsupported url to navigator pane
    
    Change-Id: I9d4fc8e3edac699c8543ab9dce8d0e35bbf40e5b
    (cherry picked from commit 9ef671364ff9fbb552a5433053af9283d12d90c7)
    (cherry picked from commit 527496750bbead21f33766d6ec0aba02a2380ab2)
    Reviewed-on: https://gerrit.libreoffice.org/16304
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 742d841..2339d3d 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -1118,10 +1118,14 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         }
     }
 
-    if ( pLinkItem )
+    if (pLinkItem)
     {
-        SfxPoolItem* pRet = rReq.GetReturnValue()->Clone();
-        pLinkItem->GetValue().Call(pRet);
+        const SfxPoolItem* pRetValue = rReq.GetReturnValue();
+        if (pRetValue)
+        {
+            SfxPoolItem* pClone = pRetValue->Clone();
+            pLinkItem->GetValue().Call(pClone);
+        }
         delete pLinkItem;
     }
 }


More information about the Libreoffice-commits mailing list