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/detdata.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/detdata.hxx')
| -rw-r--r-- | sc/inc/detdata.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 66d584596b57..9dc87fa7f57e 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -84,10 +84,10 @@ SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW, SC_DETOP_GROW class ScDetOpList : public ScDetOpArr_Impl { - BOOL bHasAddError; // updated in append + sal_Bool bHasAddError; // updated in append public: - ScDetOpList() : bHasAddError(FALSE) {} + ScDetOpList() : bHasAddError(false) {} ScDetOpList(const ScDetOpList& rList); ~ScDetOpList() {} @@ -95,11 +95,11 @@ public: void UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL operator==( const ScDetOpList& r ) const; // for ref-undo + sal_Bool operator==( const ScDetOpList& r ) const; // for ref-undo void Append( ScDetOpData* pData ); - BOOL HasAddError() const { return bHasAddError; } + sal_Bool HasAddError() const { return bHasAddError; } }; |