diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/inc/viewopti.hxx | |
parent | Typo. (diff) | |
parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
download | core-12343c15568dcc2c9209d8ca41fda2263122448f.tar.gz core-12343c15568dcc2c9209d8ca41fda2263122448f.zip |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/viewopti.hxx')
-rw-r--r-- | sc/inc/viewopti.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 38e254f29fbd..998f1f693b28 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -67,8 +67,8 @@ enum ScVObjType VOBJ_TYPE_DRAW }; -#define MAX_OPT (USHORT)VOPT_BIGHANDLES+1 -#define MAX_TYPE (USHORT)VOBJ_TYPE_DRAW+1 +#define MAX_OPT (sal_uInt16)VOPT_BIGHANDLES+1 +#define MAX_TYPE (sal_uInt16)VOBJ_TYPE_DRAW+1 #define SC_STD_GRIDCOLOR COL_LIGHTGRAY @@ -101,8 +101,8 @@ public: void SetDefaults(); - void SetOption( ScViewOption eOpt, BOOL bNew = TRUE ) { aOptArr[eOpt] = bNew; } - BOOL GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } + void SetOption( ScViewOption eOpt, sal_Bool bNew = sal_True ) { aOptArr[eOpt] = bNew; } + sal_Bool GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; } ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; } @@ -112,14 +112,14 @@ public: const ScGridOptions& GetGridOptions() const { return aGridOpt; } void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } - SvxGridItem* CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const; + SvxGridItem* CreateGridItem( sal_uInt16 nId = SID_ATTR_GRID_OPTIONS ) const; const ScViewOptions& operator= ( const ScViewOptions& rCpy ); int operator== ( const ScViewOptions& rOpt ) const; int operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); } private: - BOOL aOptArr [MAX_OPT]; + sal_Bool aOptArr [MAX_OPT]; ScVObjMode aModeArr [MAX_TYPE]; Color aGridCol; String aGridColName; @@ -134,7 +134,7 @@ class SC_DLLPUBLIC ScTpViewItem : public SfxPoolItem { public: TYPEINFO(); - ScTpViewItem( USHORT nWhich, const ScViewOptions& rOpt ); + ScTpViewItem( sal_uInt16 nWhich, const ScViewOptions& rOpt ); ScTpViewItem( const ScTpViewItem& rItem ); ~ScTpViewItem(); |