From a673fc9e4b1d04c26a486caa8babf7bd003d5b38 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Tue, 15 Sep 2015 17:04:58 +0200
Subject: [PATCH 114/398] LOK: Avoid crash when the command is not available in
 the given component.

In that case we get a NULL pSlot.

Change-Id: I38783ed198b1ab9860398f59ef872a295cbae6f8
(cherry picked from commit a191076e3b4063a074ebf1a4ef4cded25cebdb8c)
---
 desktop/source/lib/init.cxx | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e56284cdb7cb..87471454b5d2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -555,7 +555,7 @@ static void doc_iniUnoCommands ()
     util::URL aCommandURL;
     const SfxSlot* pSlot = NULL;
     SfxViewShell* pViewShell = SfxViewShell::Current();
-    SfxViewFrame* pViewFrame = (pViewShell ? pViewShell->GetViewFrame() : NULL);
+    SfxViewFrame* pViewFrame = pViewShell? pViewShell->GetViewFrame(): NULL;
 
     // check if Frame-Controller were created.
     if (!pViewShell && !pViewFrame)
@@ -564,26 +564,21 @@ static void doc_iniUnoCommands ()
         return;
     }
 
-    SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool( pViewFrame );
-    uno::Reference<util::XURLTransformer> xParser =
-        util::URLTransformer::create(xContext);
+    SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(pViewFrame);
+    uno::Reference<util::XURLTransformer> xParser(util::URLTransformer::create(xContext));
 
-    for (
-        sal_uInt32 nIterator = 0;
-        nIterator < SAL_N_ELEMENTS(sUnoCommands);
-        nIterator++
-        )
+    for (sal_uInt32 nIterator = 0; nIterator < SAL_N_ELEMENTS(sUnoCommands); nIterator++)
     {
         aCommandURL.Complete = sUnoCommands[nIterator];
         xParser->parseStrict(aCommandURL);
         pSlot = rSlotPool.GetUnoSlot(aCommandURL.Path);
 
-        // Initialize slot to dispatch Uno Command.
-        uno::Reference<frame::XDispatch> xDispatch =
-            pViewFrame->GetBindings().GetDispatch( pSlot, aCommandURL, false );
-        if (!xDispatch.is())
+        // when null, this command is not supported by the given component
+        // (like eg. Calc does not have ".uno:DefaultBullet" etc.)
+        if (pSlot)
         {
-            SAL_WARN("lok", "iniUnoCommands: No XDispatch interface : " + aCommandURL.Complete);
+            // Initialize slot to dispatch .uno: Command.
+            pViewFrame->GetBindings().GetDispatch(pSlot, aCommandURL, false);
         }
     }
 }
-- 
2.12.0