summaryrefslogtreecommitdiffstats
path: root/sd/source/ui/view/drviews3.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-03-30 14:54:52 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-03-30 14:54:52 +0000
commitd564cebbab8309e39ae6bc265cd58086ded919e0 (patch)
treee02003e1dd65c1a312e7df209f6164fef80f3caa /sd/source/ui/view/drviews3.cxx
parentINTEGRATION: CWS interop12 (1.20.76); FILE MERGED (diff)
downloadcore-d564cebbab8309e39ae6bc265cd58086ded919e0.tar.gz
core-d564cebbab8309e39ae6bc265cd58086ded919e0.zip
INTEGRATION: CWS interop12 (1.21.82); FILE MERGED
2004/02/17 12:20:09 cl 1.21.82.7: fixed merge problems 2004/02/16 11:28:58 cl 1.21.82.6: fixed header problems 2004/02/13 21:27:18 cl 1.21.82.5: RESYNC: (1.22-1.23); FILE MERGED 2003/12/09 23:07:18 cl 1.21.82.4: RESYNC: (1.21-1.22); FILE MERGED 2003/11/07 09:13:21 cl 1.21.82.3: #i20949# added header&footer support for impress 2003/11/04 16:31:28 cl 1.21.82.2: #i20949# added header&footer support for impress 2003/09/19 14:38:28 cl 1.21.82.1: #111385# initial version
Diffstat (limited to 'sd/source/ui/view/drviews3.cxx')
-rw-r--r--sd/source/ui/view/drviews3.cxx69
1 files changed, 67 insertions, 2 deletions
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index aae43c063876..26e1cd3bcb23 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: drviews3.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: obo $ $Date: 2004-01-20 13:37:15 $
+ * last change: $Author: rt $ $Date: 2004-03-30 15:54:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -172,6 +172,12 @@
#include "drawview.hxx"
#endif
#include "drawdoc.hxx"
+#include "DrawViewShell.hxx"
+#include "Ruler.hxx"
+#include "DrawDocShell.hxx"
+#include "PreviewWindow.hxx"
+#include "headerfooterdlg.hxx"
+#include "masterlayoutdlg.hxx"
#include "Ruler.hxx"
#include "DrawDocShell.hxx"
#ifndef SD_PREVIEW_WINDOW_HXX
@@ -371,6 +377,65 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
break;
}
+ case SID_HEADER_AND_FOOTER:
+ case SID_INSERT_PAGE_NUMBER:
+ case SID_INSERT_DATE_TIME:
+ {
+ sd::HeaderFooterDialog::execute( this, pWindow, GetDoc(), pActualPage );
+
+ pWindow->Invalidate();
+ UpdatePreview( pActualPage );
+
+ Invalidate();
+ rReq.Done ();
+
+ break;
+ }
+
+ case SID_MASTER_LAYOUTS_SLIDE:
+ {
+ SdPage* pPage = pActualPage;
+ if( pPage->GetPageKind() == PK_NOTES )
+ {
+ pPage = (SdPage*)GetDoc()->GetPage( pPage->GetPageNum() - 1 );
+ }
+ else if( pPage->GetPageKind() == PK_HANDOUT )
+ {
+ pPage = GetDoc()->GetMasterSdPage(0,PK_STANDARD);
+ }
+
+ sd::MasterLayoutDialog::execute( pWindow, GetDoc(), pPage );
+ Invalidate();
+ rReq.Done ();
+ break;
+ }
+
+ case SID_MASTER_LAYOUTS_NOTES:
+ {
+ SdPage* pPage = pActualPage;
+ if( pPage->GetPageKind() == PK_STANDARD )
+ {
+ pPage = (SdPage*)GetDoc()->GetPage( pPage->GetPageNum() + 1 );
+ }
+ else if( pPage->GetPageKind() == PK_HANDOUT )
+ {
+ pPage = GetDoc()->GetMasterSdPage(0,PK_NOTES);
+ }
+
+ sd::MasterLayoutDialog::execute( pWindow, GetDoc(), pPage );
+ Invalidate();
+ rReq.Done ();
+ break;
+ }
+
+ case SID_MASTER_LAYOUTS_HANDOUTS:
+ {
+ sd::MasterLayoutDialog::execute( pWindow, GetDoc(), GetDoc()->GetMasterSdPage(0,PK_HANDOUT) );
+ Invalidate();
+ rReq.Done ();
+ break;
+ }
+
case SID_OBJECTRESIZE:
{
/******************************************************************