From 31d5d92515435bd321059203bbb60bf0f7ad82bb Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 20 Jan 2004 11:08:07 +0000 Subject: [PATCH] INTEGRATION: CWS impress1 (1.1.1.1.262); FILE MERGED 2003/09/16 13:36:03 af 1.1.1.1.262.1: #111996# Introduction of namespace sd. Use of sub-shells. --- sd/source/ui/inc/fuparagr.hxx | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx index 86f54e866a84..55b3297f3e00 100644 --- a/sd/source/ui/inc/fuparagr.hxx +++ b/sd/source/ui/inc/fuparagr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fuparagr.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:39 $ + * last change: $Author: obo $ $Date: 2004-01-20 12:08:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,25 +59,34 @@ * ************************************************************************/ -#ifndef _SD_FUPARAGR_HXX -#define _SD_FUPARAGR_HXX +#ifndef SD_FU_PARAGRAPH_HXX +#define SD_FU_PARAGRAPH_HXX -#ifndef _SD_FUPOOR_HXX +#ifndef SD_FU_POOR_HXX #include "fupoor.hxx" #endif -class FuParagraph : public FuPoor +namespace sd { + +class FuParagraph + : public FuPoor { - public: +public: TYPEINFO(); - FuParagraph( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, - SdDrawDocument* pDoc, SfxRequest& rReq); - ~FuParagraph() {} + FuParagraph ( + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq); + virtual ~FuParagraph (void) {} virtual void Activate() {} // Function aktivieren virtual void Deactivate() {} // Function deaktivieren }; -#endif // _SD_FUPARAGR_HXX +} // end of namespace + +#endif