diff options
Diffstat (limited to 'sc/inc/dpglobal.hxx')
| -rw-r--r-- | sc/inc/dpglobal.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx index b76bf116f587..79a2743e1620 100644 --- a/sc/inc/dpglobal.hxx +++ b/sc/inc/dpglobal.hxx @@ -118,20 +118,20 @@ public: private: union { - ULONG nNumFormat; + sal_uLong nNumFormat; sal_Int32 mnDatePart; }; String aString; double fValue; - BYTE mbFlag; + sal_uInt8 mbFlag; friend class ScDPCache; public: ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){} - ScDPItemData( ULONG nNF, const String & rS, double fV, BYTE bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){} - ScDPItemData( const String& rS, double fV = 0.0, bool bHV = FALSE, const ULONG nNumFormat = 0 , bool bData = TRUE) ; - ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab ); + ScDPItemData( sal_uLong nNF, const String & rS, double fV, sal_uInt8 bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){} + ScDPItemData( const String& rS, double fV = 0.0, bool bHV = false, const sal_uLong nNumFormat = 0 , bool bData = true) ; + ScDPItemData( ScDocument* pDoc, SCROW nRow, sal_uInt16 nCol, sal_uInt16 nDocTab ); void SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; } bool IsCaseInsEqual( const ScDPItemData& r ) const; @@ -153,7 +153,7 @@ public: bool IsValue() const; String GetString() const ; double GetValue() const ; - ULONG GetNumFormat() const ; + sal_uLong GetNumFormat() const ; bool HasStringData() const ; bool IsDate() const; bool HasDatePart() const; @@ -161,8 +161,8 @@ public: TypedStrData* CreateTypeString( ); sal_uInt8 GetType() const; - BYTE & GetFlag() throw() { return mbFlag; } - const BYTE & GetFlag() const throw() { return const_cast<ScDPItemData*>(this)->GetFlag(); } + sal_uInt8 & GetFlag() throw() { return mbFlag; } + const sal_uInt8 & GetFlag() const throw() { return const_cast<ScDPItemData*>(this)->GetFlag(); } }; class SC_DLLPUBLIC ScDPItemDataPool |