diff options
Diffstat (limited to 'sc/inc/pivot.hxx')
| -rw-r--r-- | sc/inc/pivot.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 489f272bc8ba..dbf54fb6ed82 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -77,11 +77,11 @@ typedef ::boost::shared_ptr<ScDPLabelData> ScDPLabelDataRef; struct PivotField { SCsCOL nCol; - USHORT nFuncMask; - USHORT nFuncCount; + sal_uInt16 nFuncMask; + sal_uInt16 nFuncCount; ::com::sun::star::sheet::DataPilotFieldReference maFieldRef; - explicit PivotField( SCsCOL nNewCol = 0, USHORT nNewFuncMask = PIVOT_FUNC_NONE ); + explicit PivotField( SCsCOL nNewCol = 0, sal_uInt16 nNewFuncMask = PIVOT_FUNC_NONE ); bool operator==( const PivotField& r ) const; }; @@ -103,17 +103,17 @@ struct ScPivotParam SCSIZE nColCount; SCSIZE nRowCount; SCSIZE nDataCount; - BOOL bIgnoreEmptyRows; - BOOL bDetectCategories; - BOOL bMakeTotalCol; - BOOL bMakeTotalRow; + sal_Bool bIgnoreEmptyRows; + sal_Bool bDetectCategories; + sal_Bool bMakeTotalCol; + sal_Bool bMakeTotalRow; ScPivotParam(); ScPivotParam( const ScPivotParam& r ); ~ScPivotParam(); ScPivotParam& operator= ( const ScPivotParam& r ); - BOOL operator== ( const ScPivotParam& r ) const; + sal_Bool operator== ( const ScPivotParam& r ) const; //UNUSED2009-05 void Clear (); void ClearPivotArrays(); void SetLabelData (const ::std::vector<ScDPLabelDataRef>& r); @@ -139,7 +139,7 @@ struct ScDPLabelData ::rtl::OUString maName; /// Original name of the dimension. ::rtl::OUString maLayoutName; /// Layout name (display name) SCsCOL mnCol; - USHORT mnFuncMask; /// Page/Column/Row subtotal function. + sal_uInt16 mnFuncMask; /// Page/Column/Row subtotal function. sal_Int32 mnUsedHier; /// Used hierarchy. sal_Int32 mnFlags; /// Flags from the DataPilotSource dimension bool mbShowAll; /// true = Show all (also empty) results. @@ -181,11 +181,11 @@ struct ScDPLabelData struct ScDPFuncData { short mnCol; - USHORT mnFuncMask; + sal_uInt16 mnFuncMask; ::com::sun::star::sheet::DataPilotFieldReference maFieldRef; - explicit ScDPFuncData( short nNewCol, USHORT nNewFuncMask ); - explicit ScDPFuncData( short nNewCol, USHORT nNewFuncMask, + explicit ScDPFuncData( short nNewCol, sal_uInt16 nNewFuncMask ); + explicit ScDPFuncData( short nNewCol, sal_uInt16 nNewFuncMask, const ::com::sun::star::sheet::DataPilotFieldReference& rFieldRef ); }; |