diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:33:40 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:33:40 +0100 |
| commit | e6064484fae8aa2797f86c68e9a8d23d2e213367 (patch) | |
| tree | db2f4d140efca43ab01dee4fc053fff0829d106b /sc/inc/dptabdat.hxx | |
| parent | 9e0a09e89c38774dd1af902387a8b25de158b634 (diff) | |
| parent | 378c75a798c8baa34cb26e7f07fe28cb5ee2a85f (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
chart2/source/controller/main/UndoManager.cxx
chart2/source/tools/RegressionCurveHelper.cxx
sc/inc/address.hxx
sc/inc/attrib.hxx
sc/inc/bigrange.hxx
sc/inc/callform.hxx
sc/inc/cell.hxx
sc/inc/chartarr.hxx
sc/inc/chartlis.hxx
sc/inc/chgtrack.hxx
sc/inc/collect.hxx
sc/inc/compiler.hxx
sc/inc/detdata.hxx
sc/inc/document.hxx
sc/inc/fillinfo.hxx
sc/inc/olinetab.hxx
sc/inc/prnsave.hxx
sc/inc/queryparam.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/table.hxx
sc/inc/validat.hxx
sc/inc/zforauto.hxx
sc/source/core/data/documen2.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table1.cxx
sc/source/core/tool/address.cxx
sc/source/core/tool/token.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/excel/impop.cxx
sc/source/filter/excel/xename.cxx
sc/source/filter/inc/formel.hxx
sc/source/filter/inc/xename.hxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlnexpi.cxx
sc/source/filter/xml/xmlnexpi.hxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/namedlg.hxx
sc/source/ui/namedlg/namedlg.cxx
sc/source/ui/src/namedlg.src
Diffstat (limited to 'sc/inc/dptabdat.hxx')
| -rw-r--r-- | sc/inc/dptabdat.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 5a676e69f046..7b3dde760246 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -75,9 +75,9 @@ namespace com { namespace sun { namespace star { namespace sheet { struct ScDPValueData { double fValue; - BYTE nType; + sal_uInt8 nType; - void Set( double fV, BYTE nT ) { fValue = fV; nType = nT; } + void Set( double fV, sal_uInt8 nT ) { fValue = fV; nType = nT; } }; class ScDPResultMember; @@ -135,12 +135,12 @@ public: virtual long GetColumnCount() = 0; virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ; virtual String getDimensionName(long nColumn) = 0; - virtual BOOL getIsDataLayoutDimension(long nColumn) = 0; - virtual BOOL IsDateDimension(long nDim) = 0; - virtual ULONG GetNumberFormat(long nDim); - virtual UINT32 GetNumberFormatByIdx( NfIndexTableOffset ); + virtual sal_Bool getIsDataLayoutDimension(long nColumn) = 0; + virtual sal_Bool IsDateDimension(long nDim) = 0; + virtual sal_uLong GetNumberFormat(long nDim); + virtual sal_uInt32 GetNumberFormatByIdx( NfIndexTableOffset ); virtual void DisposeData() = 0; - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0; + virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ) = 0; virtual bool IsRepeatIfEmpty(); @@ -153,12 +153,12 @@ public: virtual const ScDPCacheTable& GetCacheTable() const = 0; // overloaded in ScDPGroupTableData: - virtual BOOL IsBaseForGroup(long nDim) const; + virtual sal_Bool IsBaseForGroup(long nDim) const; virtual long GetGroupBase(long nGroupDim) const; - virtual BOOL IsNumOrDateGroup(long nDim) const; - virtual BOOL IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, + virtual sal_Bool IsNumOrDateGroup(long nDim) const; + virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, const ScDPItemData& rBaseData, long nBaseIndex ) const; - virtual BOOL HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, + virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, const ScDPItemData& rSecondData, long nSecondIndex ) const; virtual long GetMembersCount( long nDim ); |