[Libreoffice-commits] core.git: sd/sdi sd/source

[Michael Meeks]

 sd/sdi/SlideSorterController.sdi |    1 +
 sd/sdi/drviewsh.sdi              |    1 +
 sd/sdi/outlnvsh.sdi              |    1 +
 sd/source/ui/view/drviews6.cxx   |    2 ++
 sd/source/ui/view/drviews7.cxx   |    5 +++++
 5 files changed, 10 insertions(+)

New commits:
commit 155e27cc4fffb647d116b02e0062d8ce3f8d0ef3
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Feb 7 12:16:15 2013 +0000

    sdremote - disable the menu item if it is not compiled in.
    
    Change-Id: Id054eb611fe86fdaaf1bba8d1e85342a3cc0e146

diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index a71f431..85a0d80 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -212,6 +212,7 @@ interface SlideSorterView
     SID_REMOTE_DLG
     [
         ExecMethod = FuTemporary ;
+        StateMethod = GetMenuState ;
     ]
     SID_CUSTOMSHOW_DLG
     [
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index e93ca69..5c1e2c3 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -113,6 +113,7 @@ interface ImpressEditView : DrawView
     SID_REMOTE_DLG
     [
         ExecMethod = FuTemporary ;
+        StateMethod = GetMenuState ;
     ]
     SID_CUSTOMSHOW_DLG
     [
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index b98cfdb..dbe34ed 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -352,6 +352,7 @@ interface OutlineView
     SID_REMOTE_DLG
     [
         ExecMethod = FuTemporary ;
+        StateMethod = GetMenuState ;
     ]
     SID_CUSTOMSHOW_DLG
     [
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 001d5d6..13b0b6a 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -624,10 +624,12 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq)
 
         case SID_REMOTE_DLG:
         {
+#ifdef ENABLE_SDREMOTE
              SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
              VclAbstractDialog* pDlg = pFact ? pFact->CreateRemoteDialog(GetActiveWindow()) : 0;
              if (pDlg)
                  pDlg->Execute();
+#endif
         }
         break;
 
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index af1eb65..c1c2bc6 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -995,6 +995,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
        rSet.DisableItem(SID_ZOOM_PREV);
     }
 
+#ifndef ENABLE_SDREMOTE
+    rSet.ClearItem(SID_REMOTE_DLG);
+    rSet.DisableItem(SID_REMOTE_DLG);
+#endif
+
     // EditText aktiv
     if (GetViewShellBase().GetViewShellManager()->GetShell(RID_DRAW_TEXT_TOOLBOX) != NULL)
     {