diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:17:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:17:20 +0000 |
| commit | b760bb99b2d53da7b9cd8bf5c6ac2ff65438abe6 (patch) | |
| tree | 337a60544a2c181d5d4c900230bed89189b6fa43 /sw/inc/viewopt.hxx | |
| parent | c258e24f0448a93aa68f1cebca39612d21c322e0 (diff) | |
INTEGRATION: CWS swwarnings (1.24.242); FILE MERGED
2007/08/20 15:19:34 tl 1.24.242.3: RESYNC: (1.24-1.25); FILE MERGED
2007/04/11 07:02:36 tl 1.24.242.2: #i69287# warning-free code
2007/02/22 15:05:39 tl 1.24.242.1: #i69287# warning-free code
Diffstat (limited to 'sw/inc/viewopt.hxx')
| -rw-r--r-- | sw/inc/viewopt.hxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index db9f48546a43..f11c70cdf6e8 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -4,9 +4,9 @@ * * $RCSfile: viewopt.hxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2007-06-27 13:15:07 $ + * last change: $Author: hr $ $Date: 2007-09-27 08:17:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,6 +44,8 @@ #include <tools/color.hxx> #endif +#include <svx/zoomitem.hxx> + #ifndef INCLUDED_SWDLLAPI_H #include "swdllapi.h" #endif @@ -183,7 +185,7 @@ protected: // Maszstab USHORT nZoom; // Angaben in Prozent - BYTE eZoom; // 'enum' fuer Zoom + SvxZoomType eZoom; // 'enum' fuer Zoom BYTE nTblDest; // Ziel fuer Tabellenhintergrund #ifndef PRODUCT @@ -481,7 +483,7 @@ public: BOOL IsPrtFormat() const { return nUIOptions & VIEWOPT_2_PRTFORMAT ? TRUE : FALSE; } - BYTE GetZoomType() const { return eZoom; } + SvxZoomType GetZoomType() const { return eZoom; } BYTE GetTblDest() const { return nTblDest; } @@ -498,7 +500,7 @@ public: void SetPrtFormat( BOOL b) { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); } - void SetZoomType (BYTE eZoom_){ eZoom = eZoom_; } + void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; } void SetTblDest( BYTE nNew ) { nTblDest = nNew; } const String& GetSymbolFont() const {return sSymbolFont;} @@ -513,11 +515,11 @@ public: BOOL IsViewHRuler(BOOL bDirect = FALSE) const { - BOOL bRet = bDirect ? + BOOL bRet = sal::static_int_cast< BOOL >( bDirect ? 0 != (nUIOptions & VIEWOPT_2_H_RULER) : !bReadonly ? (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER) - : FALSE; + : FALSE ); return bRet; } @@ -526,12 +528,12 @@ public: BOOL IsViewVRuler(BOOL bDirect = FALSE) const { - BOOL bRet = bDirect ? + BOOL bRet = sal::static_int_cast< BOOL >( bDirect ? 0 !=(nUIOptions & VIEWOPT_2_V_RULER) : !bReadonly ? (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER) - : FALSE; + : FALSE ); return bRet; } void SetViewVRuler (BOOL b) |