diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-01-20 10:12:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-01-20 10:12:57 +0000 |
| commit | bc721e2b6ae2560de94742d29dc929350492481b (patch) | |
| tree | d03089f8eadc09e72df8ae0964f4bdb1f7b96913 /sd/source/ui/func/fusldlg.cxx | |
| parent | 64ad236590931b0c38db2c2c37cd9d0e92229249 (diff) | |
INTEGRATION: CWS impress1 (1.2.72); FILE MERGED
2003/09/17 09:02:36 af 1.2.72.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd.
Diffstat (limited to 'sd/source/ui/func/fusldlg.cxx')
| -rw-r--r-- | sd/source/ui/func/fusldlg.cxx | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 97d9e1587dc1..3e115a7efb1d 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fusldlg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: vg $ $Date: 2003-06-04 12:27:46 $ + * last change: $Author: obo $ $Date: 2004-01-20 11:12:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,8 @@ #pragma hdrstop +#include "fusldlg.hxx" + #ifndef _SFXITEMSET_HXX //autogen #include <svtools/itemset.hxx> #endif @@ -74,14 +76,19 @@ #include "sdresid.hxx" #include "strings.hrc" #include "sdattr.hxx" -#include "fusldlg.hxx" #include "glob.hrc" - #include "sdmod.hxx" -#include "viewshel.hxx" +#ifndef SD_VIEW_SHELL_HXX +#include "ViewShell.hxx" +#endif +#ifndef SD_WINDOW_HXX +#include "Window.hxx" +#endif #include "optsitem.hxx" +namespace sd { + #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() TYPEINIT1( FuSlideShowDlg, FuPoor ); @@ -93,9 +100,13 @@ TYPEINIT1( FuSlideShowDlg, FuPoor ); |* \************************************************************************/ -FuSlideShowDlg::FuSlideShowDlg( SdViewShell* pViewSh, SdWindow* pWin, - SdView* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : - FuPoor( pViewSh, pWin, pView, pDoc, rReq ) +FuSlideShowDlg::FuSlideShowDlg ( + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) + : FuPoor( pViewSh, pWin, pView, pDoc, rReq ) { SfxItemSet aDlgSet( pDoc->GetPool(), ATTR_PRESENT_START, ATTR_PRESENT_END ); List aPageNameList; @@ -154,7 +165,7 @@ FuSlideShowDlg::FuSlideShowDlg( SdViewShell* pViewSh, SdWindow* pWin, aDlgSet.Put( SfxUInt32Item( ATTR_PRESENT_PAUSE_TIMEOUT, pDoc->GetPresPause() ) ); aDlgSet.Put( SfxBoolItem( ATTR_PRESENT_SHOW_PAUSELOGO, pDoc->IsPresShowLogo() ) ); - SdStartPresentationDlg aDlg( (Window*) pWindow, aDlgSet, aPageNameList, pCustomShowList ); + SdStartPresentationDlg aDlg (pWindow, aDlgSet, aPageNameList, pCustomShowList ); if( aDlg.Execute() == RET_OK ) { @@ -273,3 +284,4 @@ FuSlideShowDlg::FuSlideShowDlg( SdViewShell* pViewSh, SdWindow* pWin, delete (String*) pStr; } +} // end of namespace sd |