[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 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 ++
 4 files changed, 5 insertions(+)

New commits:
commit 7cfc33f9aff4c8db699378de54151c78e5a241f9
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.
    
    (cherry picked from commit 155e27cc4fffb647d116b02e0062d8ce3f8d0ef3)
    
    Conflicts:
    	sd/source/ui/view/drviews7.cxx
    
    Change-Id: Id054eb611fe86fdaaf1bba8d1e85342a3cc0e146
    Signed-off-by: Thorsten Behrens <tbehrens at suse.com>

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 9871c3d..71b9ac5 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;