INTEGRATION: CWS tune03 (1.3.2); FILE MERGED

2004/08/11 13:18:47 mhu 1.3.2.3: #i29979# Cleaned up resync merge leftovers.
2004/08/09 19:33:11 mhu 1.3.2.2: RESYNC: (1.3-1.6); FILE MERGED
2004/08/08 12:54:14 mhu 1.3.2.1: #i29979# Added SD_DLLPUBLIC/PRIVATE (see sddllapi.h) to exported symbols/classes.
This commit is contained in:
Rüdiger Timm 2004-08-23 07:20:50 +00:00
parent 06153ca2ff
commit bb46966253

View file

@ -2,9 +2,9 @@
*
* $RCSfile: ViewShell.hxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: rt $ $Date: 2004-08-04 08:55:08 $
* last change: $Author: rt $ $Date: 2004-08-23 08:20:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -82,10 +82,24 @@
#ifndef _SD_GLOB_HXX
#include "glob.hxx"
#endif
#ifndef _PRESENTATION_HXX
#include "pres.hxx"
#endif
#ifndef _SD_CFGID_HXX
#include "cfgids.hxx"
#endif
#ifndef _SD_VIEW_HXX
#include "View.hxx"
#endif
#ifndef INCLUDED_SDDLLAPI_H
#include "sddllapi.h"
#endif
#ifndef INCLUDED_MEMORY
#include <memory>
#define INCLUDED_MEMORY
#endif
class SdPage;
class SvxRuler;
@ -207,10 +221,11 @@ public:
inline ::sd::View* GetView (void) const;
inline SdrView* GetDrawView (void) const;
DrawDocShell* GetDocSh (void) const;
SD_DLLPUBLIC DrawDocShell* GetDocSh (void) const;
SdDrawDocument* GetDoc (void) const;
SfxViewFrame* GetViewFrame (void) const;
SD_DLLPUBLIC SfxViewFrame* GetViewFrame (void) const;
/** The active window is usually the mpContentWindow. When there is a
show running then the active window is a ShowWindow.