[Libreoffice-commits] .: sd/inc sd/sdi sd/source
Andrzej J.R. Hunt
ajrhunt at kemper.freedesktop.org
Wed Aug 8 02:49:27 PDT 2012
sd/inc/sdabstdlg.hxx | 2 -
sd/inc/sdcommands.h | 2 -
sd/sdi/SlideSorterController.sdi | 4 ++
sd/sdi/drviewsh.sdi | 4 ++
sd/sdi/outlnvsh.sdi | 4 ++
sd/sdi/sdraw.sdi | 25 +++++++++++++++++
sd/source/ui/dlg/RemoteDialog.cxx | 8 ++++-
sd/source/ui/dlg/RemoteDialog.src | 3 +-
sd/source/ui/dlg/sddlgfact.cxx | 8 ++---
sd/source/ui/dlg/sddlgfact.hxx | 2 -
sd/source/ui/inc/RemoteDialog.hxx | 10 +++++-
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 1
sd/source/ui/view/drviews6.cxx | 10 +++---
13 files changed, 67 insertions(+), 16 deletions(-)
New commits:
commit ae5140e0541fd5142d1db1f8aa1461e70d5fd072
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Wed Aug 8 11:42:58 2012 +0200
Remote dialog now showing.
Change-Id: I20857202e70a975d249ac0f121947691ac274602
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 6314383..063a735 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -202,7 +202,7 @@ public:
virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0;
virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs,
const std::vector<String> &rPageNames, List* pCSList ) = 0;
-// virtual VclAbstractDialog* CreateSdRemoteDlg( ::Window* pWindow );
+ virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) = 0;
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index e51869c..ebf02f5 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -93,7 +93,7 @@
#define CMD_SID_OUTLINE_TEXT_AUTOFIT ".uno.OutlineTextAutofit"
#define CMD_SID_PAGESETUP ".uno:PageSetup"
#define CMD_SID_PRESENTATION ".uno:Presentation"
-#define CMD_SID_REMOTE ".uno:Remote"
+#define CMD_SID_REMOTE_DLG ".uno:Remote"
#define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout"
#define CMD_SID_RENAMELAYER ".uno:RenameLayer"
#define CMD_SID_RENAMEPAGE ".uno:RenamePage"
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 765cc04..c3e14c6 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -223,6 +223,10 @@ interface SlideSorterView
[
ExecMethod = FuTemporary ;
]
+ SID_REMOTE_DLG
+ [
+ ExecMethod = FuTemporary ;
+ ]
SID_CUSTOMSHOW_DLG
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 8748fcb..e93ca69 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -110,6 +110,10 @@ interface ImpressEditView : DrawView
[
ExecMethod = FuTemporary ;
]
+ SID_REMOTE_DLG
+ [
+ ExecMethod = FuTemporary ;
+ ]
SID_CUSTOMSHOW_DLG
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 4dd31c9..8a83d3b 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -349,6 +349,10 @@ interface OutlineView
[
ExecMethod = FuTemporary ;
]
+ SID_REMOTE_DLG
+ [
+ ExecMethod = FuTemporary ;
+ ]
SID_CUSTOMSHOW_DLG
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 03208aa..0183a54 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -5204,6 +5204,31 @@ SfxVoidItem PresentationDialog SID_PRESENTATION_DLG
]
//--------------------------------------------------------------------------
+SfxVoidItem Remote SID_REMOTE_DLG
+()
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = TRUE,
+ HasCoreId = FALSE,
+ HasDialog = TRUE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerItem;
+ Synchron;
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_OPTIONS;
+]
+
+//--------------------------------------------------------------------------
SfxVoidItem PresentationEnd SID_PRESENTATION_END
()
[
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 5574c02..69894ec 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -16,10 +16,16 @@
#include "RemoteDialog.hxx"
#include "RemoteDialog.hrc"
-SdRemoteDlg::SdRemoteDlg( Window *pWindow ) :
+using namespace sd;
+
+RemoteDialog::RemoteDialog( Window *pWindow ) :
ModalDialog ( pWindow, SdResId( DLG_PAIR_REMOTE ) )
{
FreeResource();
}
+RemoteDialog::~RemoteDialog()
+{
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sd/source/ui/dlg/RemoteDialog.src b/sd/source/ui/dlg/RemoteDialog.src
index df261e9..1b5ef96 100644
--- a/sd/source/ui/dlg/RemoteDialog.src
+++ b/sd/source/ui/dlg/RemoteDialog.src
@@ -13,12 +13,13 @@
ModalDialog DLG_PAIR_REMOTE
{
- HelpID = CMD_SID_REMOTE ;
+ HelpID = CMD_SID_REMOTE_DLG ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 256, 205 ) ;
Text [ en-US ] = "Impress Remote" ;
Moveable = TRUE ;
+ Closeable = TRUE ;
OKButton BTN_CONNECT
{
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 5e4e727..87bf533 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -492,10 +492,10 @@ AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentatio
// add for SdStartPresentationDlg end
// add for SdRemoteDlg begin
-// VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdRemoteDlg( ::Window* pWindow )
-// {
-// return new VclAbstractDialog_Impl( new SdRemoteDlg( pWindow ) );
-// }
+VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( ::Window* pWindow )
+{
+ return new VclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) );
+}
// add for SdRemoteDlg end
// add for SdPresLayoutTemplateDlg begin
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 4af3718..df28929 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -276,7 +276,7 @@ public:
virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr );
virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs,
const std::vector<String> &rPageNames, List* pCSList );
-// virtual VclAbstractDialog* CreateSdRemoteDlg( ::Window* pWindow );
+ virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ); // ad for RemoteDialog
virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool );
virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs);
virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView );
diff --git a/sd/source/ui/inc/RemoteDialog.hxx b/sd/source/ui/inc/RemoteDialog.hxx
index 4f90951..3056e3d 100644
--- a/sd/source/ui/inc/RemoteDialog.hxx
+++ b/sd/source/ui/inc/RemoteDialog.hxx
@@ -15,14 +15,20 @@
#include <vcl/dialog.hxx>
#include <vcl/field.hxx>
-class SdRemoteDlg : public ModalDialog
+namespace sd
+{
+
+class RemoteDialog : public ModalDialog
{
public:
- SdRemoteDlg( Window* pWindow );
+ RemoteDialog( Window* pWindow );
+ ~RemoteDialog();
};
+}
+
#endif // _SD_REMOTEDIALOG_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index ec04129..3b53f1d 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1186,6 +1186,7 @@ void SlotManager::ChangeSlideExclusionState (
SfxBindings& rBindings (mrSlideSorter.GetViewShell()->GetViewFrame()->GetBindings());
rBindings.Invalidate(SID_PRESENTATION);
+ rBindings.Invalidate(SID_REMOTE_DLG);
rBindings.Invalidate(SID_REHEARSE_TIMINGS);
rBindings.Invalidate(SID_HIDE_SLIDE);
rBindings.Invalidate(SID_SHOW_SLIDE);
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 40af283..4977c79 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -58,7 +58,6 @@
#include "NavigatorChildWindow.hxx"
#include "LayerDialogChildWindow.hxx"
#include "sdresid.hxx"
-// #include "sdabstdlg.hxx"
#include "fupoor.hxx"
#include "fusldlg.hxx"
#include "drawdoc.hxx"
@@ -69,6 +68,7 @@
#include "FrameView.hxx"
#include "Window.hxx"
#include "DrawDocShell.hxx"
+#include "sdabstdlg.hxx"
#include "framework/FrameworkHelper.hxx"
namespace sd {
@@ -635,10 +635,10 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq)
case SID_REMOTE_DLG:
{
-// SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
-// VclAbstractDialog* pDlg = pFact ? pFact->CreateSdRemoteDlg(GetActiveWindow()) : 0;
-// if (pDlg)
-// pDlg->Execute();
+ SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
+ VclAbstractDialog* pDlg = pFact ? pFact->CreateRemoteDialog(GetActiveWindow()) : 0;
+ if (pDlg)
+ pDlg->Execute();
}
break;
More information about the Libreoffice-commits
mailing list