summaryrefslogtreecommitdiff
path: root/sw/inc/viewopt.hxx
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-08-23 07:42:25 +0000
committerRüdiger Timm <rt@openoffice.org>2004-08-23 07:42:25 +0000
commit2de1756bd5c2a1b48f3a8b7aae779470a259c518 (patch)
treef69c479d9e7c8e42e4e2e4096ae8a94729d7cfa1 /sw/inc/viewopt.hxx
parent1c77a5dc82c2117a3c5c5fb969a3e3ffb7cf496f (diff)
INTEGRATION: CWS tune03 (1.19.114); FILE MERGED
2004/07/19 19:10:47 mhu 1.19.114.1: #i29979# Added SW_DLLPUBLIC/PRIVATE (see swdllapi.h) to exported symbols/classes.
Diffstat (limited to 'sw/inc/viewopt.hxx')
-rw-r--r--sw/inc/viewopt.hxx16
1 files changed, 11 insertions, 5 deletions
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 3e6acca0ebdf..a723637d9f8d 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewopt.hxx,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: obo $ $Date: 2004-08-12 12:09:43 $
+ * last change: $Author: rt $ $Date: 2004-08-23 08:42:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,7 +70,13 @@
#ifndef _TOOLS_COLOR_HXX
#include <tools/color.hxx>
#endif
+
+#ifndef INCLUDED_SWDLLAPI_H
+#include "swdllapi.h"
+#endif
+#ifndef _AUTHRATR_HXX
#include "authratr.hxx"
+#endif
class SwRect;
class Window;
@@ -527,7 +533,7 @@ public:
void SetPrtFormat( BOOL b)
{ b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
- void SetZoomType (BYTE nZoom){ eZoom = nZoom; }
+ void SetZoomType (BYTE eZoom_){ eZoom = eZoom_; }
void SetTblDest( BYTE nNew ) { nTblDest = nNew; }
const String& GetSymbolFont() const {return sSymbolFont;}
@@ -598,7 +604,7 @@ public:
static Color& GetDirectCursorColor();
static Color& GetTextGridColor();
static Color& GetSpellColor();
- static Color& GetFontColor();
+ SW_DLLPUBLIC static Color& GetFontColor();
static Color& GetFieldShadingsColor();
static Color& GetSectionBoundColor();
static Color& GetPageBreakColor();
@@ -636,7 +642,7 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
// Hilfsfunktion zur Ermittlung der HTML-Faehigkeiten
-USHORT GetHtmlMode(const SwDocShell*);
+SW_DLLPUBLIC USHORT GetHtmlMode(const SwDocShell*);
#endif