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

[Andrzej Hunt]

 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |   13 +++++++++++++
 sd/source/ui/view/outlnvs2.cxx                         |   11 +++++++++++
 2 files changed, 24 insertions(+)

New commits:
commit d9429698b9784634768e831248f1e081ed3d6114
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Fri Jun 27 18:20:14 2014 +0200

    fdo#63378 Enable Impress Remote Dialog menu item for all view shells.
    
    Change-Id: I47f040c1463b4be648d411c2f7f0070b8aed3e9c
    (cherry picked from commit d61468314bbfd2a79929b48e62d7e5ed354ab79b)
    Reviewed-on: https://gerrit.libreoffice.org/9976
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 71e7b2f..d2772bc 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -284,6 +284,19 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
         }
         break;
 
+        case SID_REMOTE_DLG:
+        {
+#ifdef ENABLE_SDREMOTE
+             SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
+             VclAbstractDialog* pDlg = pFact ?
+                 pFact->CreateRemoteDialog( mrSlideSorter.GetContentWindow().get() ) :
+                 0;
+             if (pDlg)
+                 pDlg->Execute();
+#endif
+        }
+        break;
+
         default:
             break;
     }
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 6bdb2b3..1278094 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -287,6 +287,17 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
         }
         break;
 
+        case SID_REMOTE_DLG:
+        {
+#ifdef ENABLE_SDREMOTE
+             SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
+             VclAbstractDialog* pDlg = pFact ? pFact->CreateRemoteDialog(GetActiveWindow()) : 0;
+             if (pDlg)
+                 pDlg->Execute();
+#endif
+        }
+        break;
+
         case SID_CUSTOMSHOW_DLG:
         {
             SetCurrentFunction( FuCustomShowDlg::Create( this, GetActiveWindow(), pOlView, GetDoc(), rReq ) );