summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sd/source/ui/view/drviews7.cxx57
-rw-r--r--sd/source/ui/view/drvwshrg.cxx6
-rw-r--r--sd/source/ui/view/outlnvsh.cxx42
3 files changed, 96 insertions, 9 deletions
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 728e08a321ab..10d0d76c0025 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: drviews7.cxx,v $
*
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
*
- * last change: $Author: bm $ $Date: 2002-11-04 17:42:47 $
+ * last change: $Author: af $ $Date: 2002-11-19 15:49:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -130,6 +130,10 @@
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
#endif
+#ifndef _SFXREQUEST_HXX
+#include <sfx2/request.hxx>
+#endif
+
#pragma hdrstop
#include <svx/pfiledlg.hxx>
@@ -1618,3 +1622,52 @@ void SdDrawViewShell::GetMenuState( SfxItemSet &rSet )
+
+void SdDrawViewShell::GetState (SfxItemSet& rSet)
+{
+ // Iterate over all requested items in the set.
+ SfxWhichIter aIter( rSet );
+ USHORT nWhich = aIter.FirstWhich();
+ while (nWhich)
+ {
+ switch (nWhich)
+ {
+ case SID_SEARCH_ITEM:
+ case SID_SEARCH_OPTIONS:
+ // Forward this request to the the common (old) code of the
+ // document shell.
+ pDocSh->GetState (rSet);
+ break;
+ default:
+ OSL_TRACE ("SdDrawViewShell::GetState(): can not handle which id %d", nWhich);
+ break;
+ }
+ nWhich = aIter.NextWhich();
+ }
+}
+
+
+
+
+void SdDrawViewShell::Execute (SfxRequest& rReq)
+{
+ FuSlideShow* pFuSlideShow = GetSlideShow();
+ if (pFuSlideShow!=NULL && !pFuSlideShow->IsLivePresentation())
+ {
+ // Do not execute anything during a native slide show.
+ return;
+ }
+
+ switch (rReq.GetSlot())
+ {
+ case SID_SEARCH_ITEM:
+ // Forward this request to the the common (old) code of the
+ // document shell.
+ pDocSh->Execute (rReq);
+ break;
+
+ default:
+ OSL_TRACE ("SdDrawViewShell::Execute(): can not handle slot %d", rReq.GetSlot());
+ break;
+ }
+}
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index ee9fc0e0e3b1..865418abc426 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: drvwshrg.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: ka $ $Date: 2001-06-29 14:03:56 $
+ * last change: $Author: af $ $Date: 2002-11-19 15:49:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -139,6 +139,7 @@ SFX_IMPL_INTERFACE(SdDrawViewShell, SfxViewShell, SdResId(STR_DRAWVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION( SvxIMapDlgChildWindow::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() );
+ SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
}
SFX_IMPL_VIEWFACTORY(SdDrawViewShell, SdResId(STR_DEFAULTVIEW) )
@@ -181,6 +182,7 @@ SFX_IMPL_INTERFACE(SdGraphicViewShell, SfxViewShell, SdResId(STR_DRAWVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION( SvxIMapDlgChildWindow::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() );
+ SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
}
SFX_IMPL_VIEWFACTORY(SdGraphicViewShell, SdResId(STR_DEFAULTVIEW) )
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index f45e2334508e..708cd2ce9f05 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: outlnvsh.cxx,v $
*
- * $Revision: 1.41 $
+ * $Revision: 1.42 $
*
- * last change: $Author: cl $ $Date: 2002-11-13 20:41:26 $
+ * last change: $Author: af $ $Date: 2002-11-19 15:49:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -149,6 +149,12 @@
#ifndef _CLIPLISTENER_HXX
#include <svtools/cliplistener.hxx>
#endif
+#ifndef _EEITEMID_HXX
+#include <svx/eeitemid.hxx>
+#endif
+#ifndef _SFX_SRCHITEM_HXX
+#include <sfx2/srchitem.hxx>
+#endif
#ifndef _SD_OPTSITEM_HXX
#include "optsitem.hxx"
@@ -211,6 +217,7 @@ SFX_IMPL_INTERFACE(SdOutlineViewShell, SfxViewShell, SdResId(STR_OUTLINEVIEWSHEL
SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SdPreviewChildWindow::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() );
+ SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
}
SFX_IMPL_VIEWFACTORY(SdOutlineViewShell, SdResId(STR_SPECIALVIEW) )
@@ -1151,7 +1158,7 @@ void SdOutlineViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_OUTLINE_COLLAPSE_ALL);
- if ( pDocSh->GetActualFunction() )
+ /* if ( pDocSh->GetActualFunction() )
{
rSet.ClearItem( SID_DRAWINGMODE );
rSet.DisableItem( SID_DRAWINGMODE );
@@ -1175,12 +1182,12 @@ void SdOutlineViewShell::GetMenuState( SfxItemSet &rSet )
}
else
{
- aDrawBtn.Enable();
+ */ aDrawBtn.Enable();
aNotesBtn.Enable();
aHandoutBtn.Enable();
aOutlineBtn.Enable();
aSlideBtn.Enable();
- }
+ // }
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PASTE ) )
{
@@ -2482,3 +2489,28 @@ void SdOutlineViewShell::VisAreaChanged(const Rectangle& rRect)
return SdViewShell::CreateAccessibleDocumentView (pWindow);
}
}
+
+
+
+
+void SdOutlineViewShell::GetState (SfxItemSet& rSet)
+{
+ // Iterate over all requested items in the set.
+ SfxWhichIter aIter( rSet );
+ USHORT nWhich = aIter.FirstWhich();
+ while (nWhich)
+ {
+ switch (nWhich)
+ {
+ case SID_SEARCH_ITEM:
+ case SID_SEARCH_OPTIONS:
+ // Call common (old) implementation in the document shell.
+ pDocSh->GetState (rSet);
+ break;
+ default:
+ OSL_TRACE ("SdOutlineViewShell::GetState(): can not handle which id %d", nWhich);
+ break;
+ }
+ nWhich = aIter.NextWhich();
+ }
+}