diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-02-07 12:16:15 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-02-07 13:04:33 +0000 |
| commit | 155e27cc4fffb647d116b02e0062d8ce3f8d0ef3 (patch) | |
| tree | cf2ef1873c1286188ce4d0bb3d8292429bf1a241 | |
| parent | 8b581013a7386462df45e0e39cf5d0f8a9329c7c (diff) | |
sdremote - disable the menu item if it is not compiled in.
Change-Id: Id054eb611fe86fdaaf1bba8d1e85342a3cc0e146
| -rw-r--r-- | sd/sdi/SlideSorterController.sdi | 1 | ||||
| -rw-r--r-- | sd/sdi/drviewsh.sdi | 1 | ||||
| -rw-r--r-- | sd/sdi/outlnvsh.sdi | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 5 |
5 files changed, 10 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 001d5d674a53..13b0b6ab248b 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 af1eb659c1cf..c1c2bc6ec7c9 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) { |