diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-01-20 09:43:16 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-01-20 09:43:16 +0000 |
| commit | 9fd866f355c447bb0103726464135e1207a517d9 (patch) | |
| tree | 0dc228d73a19783776e2b7e8d67c41ff83b8e65e /sd/source/ui/dlg/dlgolbul.cxx | |
| parent | d7a06c5a55fd7414d75cb43031230923f4f49c52 (diff) | |
INTEGRATION: CWS impress1 (1.2.248); FILE MERGED
2003/09/17 09:20:29 af 1.2.248.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd.
Diffstat (limited to 'sd/source/ui/dlg/dlgolbul.cxx')
| -rw-r--r-- | sd/source/ui/dlg/dlgolbul.cxx | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 94a7e1d693b7..0d07c36e091b 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dlgolbul.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: thb $ $Date: 2001-06-15 18:16:50 $ + * last change: $Author: obo $ $Date: 2004-01-20 10:43:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +#include "OutlineBulletDlg.hxx" + #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif @@ -88,8 +90,8 @@ #include <svx/svdmark.hxx> #endif -#ifndef _SD_SDVIEW_HXX -#include "sdview.hxx" +#ifndef SD_VIEW_HXX +#include "View.hxx" #endif #ifndef _SVDOBJ_HXX //autogen @@ -109,11 +111,12 @@ #endif #include "glob.hrc" -#include "dlgolbul.hxx" #include "dlgolbul.hrc" //#include "enumdlg.hxx" #include "bulmaper.hxx" -#include "docshell.hxx" +#include "DrawDocShell.hxx" + +namespace sd { /************************************************************************* |* @@ -121,11 +124,14 @@ |* \************************************************************************/ -SdOutlineBulletDlg::SdOutlineBulletDlg( Window* pParent, const SfxItemSet* pAttr, SdView* pView ) : - SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), - aInputSet ( *pAttr ), - bTitle ( FALSE ), - pSdView ( pView ) +OutlineBulletDlg::OutlineBulletDlg( + ::Window* pParent, + const SfxItemSet* pAttr, + ::sd::View* pView ) + : SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), + aInputSet ( *pAttr ), + bTitle ( FALSE ), + pSdView ( pView ) { FreeResource(); @@ -223,12 +229,12 @@ SdOutlineBulletDlg::SdOutlineBulletDlg( Window* pParent, const SfxItemSet* pAttr } -SdOutlineBulletDlg::~SdOutlineBulletDlg() +OutlineBulletDlg::~OutlineBulletDlg() { delete pOutputSet; } -void SdOutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) +void OutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) { switch ( nId ) { @@ -253,7 +259,7 @@ void SdOutlineBulletDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) } } -const SfxItemSet* SdOutlineBulletDlg::GetOutputItemSet() +const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() { SfxItemSet aSet( *SfxTabDialog::GetOutputItemSet() ); pOutputSet->Put( aSet ); @@ -280,6 +286,4 @@ const SfxItemSet* SdOutlineBulletDlg::GetOutputItemSet() return pOutputSet; } - - - +} // end of namespace sd |