diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-09 14:58:06 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-09 15:25:09 -0500 |
| commit | dc261fc0c4e7f4c29b142c53d4d4e65f8ff3a092 (patch) | |
| tree | 0c6b1658de8b5dad530753ded9d3b524ddad27ce /sc/inc | |
| parent | 692496aa2e9acbb4b428cd395dbeb2ec8c8abc1e (diff) | |
Cleaning up ScDPItemData a bit...
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/dpglobal.hxx | 26 | ||||
| -rw-r--r-- | sc/inc/dptabsrc.hxx | 1 |
2 files changed, 13 insertions, 14 deletions
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx index b5ce0190b7d3..992e17152bd2 100644 --- a/sc/inc/dpglobal.hxx +++ b/sc/inc/dpglobal.hxx @@ -87,37 +87,37 @@ public: private: union { - sal_uLong nNumFormat; + sal_uLong mnNumFormat; sal_Int32 mnDatePart; }; - String aString; - double fValue; + String maString; + double mfValue; sal_uInt8 mbFlag; friend class ScDPCache; public: - ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){} - 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(); + ScDPItemData(sal_uLong nNF, const String & rS, double fV, sal_uInt8 bF); + ScDPItemData(const String& rS, double fV = 0.0, bool bHV = false, const sal_uLong nNumFormat = 0 , bool bData = true); ScDPItemData(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nDocTab, bool bLabel); - void SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; } - bool IsCaseInsEqual( const ScDPItemData& r ) const; + void SetString( const String& rS ); + bool IsCaseInsEqual(const ScDPItemData& r) const; - size_t Hash() const; + size_t Hash() const; // exact equality - bool operator==( const ScDPItemData& r ) const; + bool operator==( const ScDPItemData& r ) const; // case insensitive equality - static sal_Int32 Compare( const ScDPItemData& rA, const ScDPItemData& rB ); + static sal_Int32 Compare( const ScDPItemData& rA, const ScDPItemData& rB ); public: bool IsHasData() const ; bool IsHasErr() const ; bool IsValue() const; - String GetString() const ; - double GetValue() const ; + String GetString() const ; + double GetValue() const ; bool HasStringData() const ; bool IsDate() const; bool HasDatePart() const; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index c3b3031224c4..8a57d70d999a 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -60,7 +60,6 @@ #include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase6.hxx> -#include "dpglobal.hxx" #include "dptabdat.hxx" namespace com { namespace sun { namespace star { |