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/markarr.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/markarr.hxx')
| -rw-r--r-- | sc/inc/markarr.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index 5ae3bacc6051..352ecc1fc5bf 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -37,7 +37,7 @@ struct ScMarkEntry { SCROW nRow; - BOOL bMarked; + sal_Bool bMarked; }; class ScMarkArray @@ -52,21 +52,21 @@ friend class ScDocument; // for FillInfo public: ScMarkArray(); ~ScMarkArray(); - void Reset( BOOL bMarked = FALSE ); - BOOL GetMark( SCROW nRow ) const; - void SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ); - BOOL IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; - BOOL HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; + void Reset( sal_Bool bMarked = false ); + sal_Bool GetMark( SCROW nRow ) const; + void SetMarkArea( SCROW nStartRow, SCROW nEndRow, sal_Bool bMarked ); + sal_Bool IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; + sal_Bool HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; - BOOL HasMarks() const { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); } + sal_Bool HasMarks() const { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); } void CopyMarksTo( ScMarkArray& rDestMarkArray ) const; - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + sal_Bool Search( SCROW nRow, SCSIZE& nIndex ) const; /// Including current row, may return -1 if bUp and not found - SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; - SCROW GetMarkEnd( SCROW nRow, BOOL bUp ) const; + SCsROW GetNextMarked( SCsROW nRow, sal_Bool bUp ) const; + SCROW GetMarkEnd( SCROW nRow, sal_Bool bUp ) const; }; @@ -78,7 +78,7 @@ public: ScMarkArrayIter( const ScMarkArray* pNewArray ); ~ScMarkArrayIter(); - BOOL Next( SCROW& rTop, SCROW& rBottom ); + sal_Bool Next( SCROW& rTop, SCROW& rBottom ); }; |