INTEGRATION: CWS tune03 (1.14.72); FILE MERGED

2004/08/09 18:49:27 mhu 1.14.72.2: RESYNC: (1.14-1.16); FILE MERGED
2004/08/08 12:53:56 mhu 1.14.72.1: #i29979# Added SD_DLLPUBLIC/PRIVATE (see sddllapi.h) to exported symbols/classes.

1 files changed, 20 insertions, 5 deletions

diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 1dabe844f54f..538f7fcee5a3 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdpage.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 13:39:12 $
+ *  last change: $Author: rt $ $Date: 2004-08-23 08:12:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,10 +62,20 @@
 #ifndef _SDPAGE_HXX
 #define _SDPAGE_HXX
 
+#ifndef INCLUDED_LIST
 #include <list>
+#define INCLUDED_LIST
+#endif
+
+#ifndef INCLUDED_FUNCTIONAL
 #include <functional>
+#define INCLUDED_FUNCTIONAL
+#endif
 
+#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HPP_
 #include <com/sun/star/uno/XInterface.hpp>
+#endif
+
 #ifndef _COM_SUN_STAR_PRESENTATION_FADEEFFECT_HPP_
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #endif
@@ -76,16 +86,21 @@
 #ifndef _FM_FMPAGE_HXX //autogen
 #include <svx/fmpage.hxx>
 #endif
+
 #ifndef _SD_FADEDEF_H
 #include "fadedef.h"
 #endif
 #ifndef _SD_DIADEF_H
-#include <diadef.h>
+#include "diadef.h"
 #endif
 #ifndef _PRESENTATION
 #include "pres.hxx"
 #endif
 
+#ifndef INCLUDED_SDDLLAPI_H
+#include "sddllapi.h"
+#endif
+
 class SfxStyleSheet;
 class SdDrawDocument;
 class SdrTextObj;
@@ -150,7 +165,7 @@ namespace sd {
         SdPage* mpPage;
     };
 
-    struct HeaderFooterSettings
+    struct SD_DLLPUBLIC HeaderFooterSettings
     {
         bool mbHeaderVisible;
         String maHeaderText;
@@ -171,7 +186,7 @@ namespace sd {
     };
 };
 
-class SdPage : public FmFormPage, public SdrObjUserCall
+class SD_DLLPUBLIC SdPage : public FmFormPage, public SdrObjUserCall
 {
 friend class SdGenericDrawPage;