summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-02-07 12:16:15 +0000
committerThorsten Behrens <tbehrens@suse.com>2013-02-08 13:20:40 +0100
commit7cfc33f9aff4c8db699378de54151c78e5a241f9 (patch)
treeb21f1babb17ba9d61913f0c24fb526c9b7433e52
parentd59345634ab0af120ae5ba11a46a60832ba1ec0d (diff)
sdremote - disable the menu item if it is not compiled in.
(cherry picked from commit 155e27cc4fffb647d116b02e0062d8ce3f8d0ef3) Conflicts: sd/source/ui/view/drviews7.cxx Change-Id: Id054eb611fe86fdaaf1bba8d1e85342a3cc0e146 Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
-rw-r--r--sd/sdi/SlideSorterController.sdi1
-rw-r--r--sd/sdi/drviewsh.sdi1
-rw-r--r--sd/sdi/outlnvsh.sdi1
-rw-r--r--sd/source/ui/view/drviews6.cxx2
4 files changed, 5 insertions, 0 deletions
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index a71f43171ce1..85a0d801fd81 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 e93ca69d762b..5c1e2c3c197c 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 b98cfdb42f86..dbe34ed5bf50 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 9871c3d5d537..71b9ac5ab30f 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -625,10 +625,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;