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/dpgroup.hxx | |
| parent | WaE: silence some warnings (diff) | |
| parent | Get the unit test code to build. (diff) | |
| download | core-e6064484fae8aa2797f86c68e9a8d23d2e213367.tar.gz core-e6064484fae8aa2797f86c68e9a8d23d2e213367.zip | |
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/dpgroup.hxx')
| -rw-r--r-- | sc/inc/dpgroup.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index ce1589cef109..ada526cf1083 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -50,7 +50,7 @@ struct ScDPNumGroupInfo double End; double Step; - ScDPNumGroupInfo() : Enable(sal_False), DateValues(sal_False), AutoStart(sal_False), AutoEnd(sal_False), + ScDPNumGroupInfo() : Enable(false), DateValues(false), AutoStart(false), AutoEnd(false), Start(0.0), End(0.0), Step(0.0) {} }; @@ -208,11 +208,11 @@ public: virtual long Compare( long nDim, long nDataId1, long nDataId2); virtual String getDimensionName(long nColumn); - virtual BOOL getIsDataLayoutDimension(long nColumn); - virtual BOOL IsDateDimension(long nDim); - virtual ULONG GetNumberFormat(long nDim); + virtual sal_Bool getIsDataLayoutDimension(long nColumn); + virtual sal_Bool IsDateDimension(long nDim); + virtual sal_uLong GetNumberFormat(long nDim); virtual void DisposeData(); - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); + virtual void SetEmptyFlags( sal_Bool bIgnoreEmptyRows, sal_Bool bRepeatIfEmpty ); virtual bool IsRepeatIfEmpty(); @@ -224,12 +224,12 @@ public: virtual void CalcResults(CalcInfo& rInfo, bool bAutoShow); virtual const ScDPCacheTable& GetCacheTable() const; - 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; }; |