diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-01-20 10:05:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-01-20 10:05:47 +0000 |
| commit | 9ec5b909122aa87685e36ea5633795f98c5a3bce (patch) | |
| tree | 2102bd98973d38982e0a6e4ef50e68988417dfe4 /sd/source/ui/func/fumeasur.cxx | |
| parent | 726c85d07cd7e3261b59379516e9c5f4dbee780e (diff) | |
INTEGRATION: CWS impress1 (1.1.1.1.262); FILE MERGED
2003/09/17 09:02:32 af 1.1.1.1.262.1: #111996# Transition to stacked sub-shells. Introduction of namespace sd.
Diffstat (limited to 'sd/source/ui/func/fumeasur.cxx')
| -rw-r--r-- | sd/source/ui/func/fumeasur.cxx | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx index bf30f5aedc29..b01f606a5237 100644 --- a/sd/source/ui/func/fumeasur.cxx +++ b/sd/source/ui/func/fumeasur.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fumeasur.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:35 $ + * last change: $Author: obo $ $Date: 2004-01-20 11:05:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,9 +59,10 @@ * ************************************************************************/ - #pragma hdrstop +#include "fumeasur.hxx" + #include <svx/measure.hxx> #ifndef _SV_MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> @@ -70,11 +71,15 @@ #include <sfx2/request.hxx> #endif -#include "fumeasur.hxx" -#include "sdview.hxx" -#include "viewshel.hxx" +#ifndef SD_VIEW_HXX +#include "View.hxx" +#endif +#ifndef SD_VIEW_SHELL_HXX +#include "ViewShell.hxx" +#endif #include "drawdoc.hxx" +namespace sd { TYPEINIT1( FuMeasureDlg, FuPoor ); @@ -84,9 +89,13 @@ TYPEINIT1( FuMeasureDlg, FuPoor ); |* \************************************************************************/ -FuMeasureDlg::FuMeasureDlg(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, - SdDrawDocument* pDoc, SfxRequest& rReq) - : FuPoor(pViewSh, pWin, pView, pDoc, rReq) +FuMeasureDlg::FuMeasureDlg ( + ViewShell* pViewSh, + ::sd::Window* pWin, + ::sd::View* pView, + SdDrawDocument* pDoc, + SfxRequest& rReq) + : FuPoor(pViewSh, pWin, pView, pDoc, rReq) { SfxItemSet aNewAttr( pDoc->GetPool() ); pView->GetAttributes( aNewAttr ); @@ -120,3 +129,4 @@ FuMeasureDlg::FuMeasureDlg(SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, } +} // end of namespace sd |