diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-12 15:36:37 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-14 14:15:12 +0200 |
commit | 6c5c1c1a3b72efa62bfdf1da2a1506d259bd68c7 (patch) | |
tree | e04fdf283db64bfdcd9425326ca88d5e045ad683 /sc/source/filter | |
parent | 732a6c0d7bb07239903fe3d0b6b44d832ef0b9a4 (diff) |
sal_Bool->bool
Change-Id: Ic725c3cf148095138ad716333aca09a1a5d41683
Diffstat (limited to 'sc/source/filter')
-rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/xcl97rec.hxx | 20 | ||||
-rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 54127be3284f..856b99314af0 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -520,7 +520,7 @@ XclExpOcxControlObj::XclExpOcxControlObj( XclExpObjectManager& rObjMgr, Referenc ScfPropertySet aCtrlProp( XclControlHelper::GetControlModel( xShape ) ); // OBJ record flags - SetLocked( sal_True ); + SetLocked( true ); SetPrintable( aCtrlProp.GetBoolProperty( "Printable" ) ); SetAutoFill( false ); SetAutoLine( false ); @@ -664,7 +664,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< return; // OBJ record flags - SetLocked( sal_True ); + SetLocked( true ); SetPrintable( aCtrlProp.GetBoolProperty( "Printable" ) ); SetAutoFill( false ); SetAutoLine( false ); diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 77c413399568..2777434596fa 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -96,10 +96,10 @@ protected: XclExpMsoDrawing* pClientTextbox; XclTxo* pTxo; sal_uInt16 mnObjType; - sal_uInt16 nObjId; - sal_uInt16 nGrbit; + sal_uInt16 nObjId; + sal_uInt16 nGrbit; SCTAB mnScTab; - sal_Bool bFirstOnSheet; + bool bFirstOnSheet; bool mbOwnEscher; /// true = Escher part created on the fly. @@ -125,13 +125,13 @@ public: inline void SetTab( SCTAB nScTab ) { mnScTab = nScTab; } inline SCTAB GetTab() const { return mnScTab; } - inline void SetLocked( sal_Bool b ) + inline void SetLocked( bool b ) { b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; } - inline void SetPrintable( sal_Bool b ) + inline void SetPrintable( bool b ) { b ? nGrbit |= 0x0010 : nGrbit &= ~0x0010; } - inline void SetAutoFill( sal_Bool b ) + inline void SetAutoFill( bool b ) { b ? nGrbit |= 0x2000 : nGrbit &= ~0x2000; } - inline void SetAutoLine( sal_Bool b ) + inline void SetAutoLine( bool b ) { b ? nGrbit |= 0x4000 : nGrbit &= ~0x4000; } // set corresponding Excel object type in OBJ/ftCmo @@ -188,13 +188,13 @@ public: class XclObjDropDown : public XclObj { private: - sal_Bool bIsFiltered; + bool bIsFiltered; virtual void WriteSubRecs( XclExpStream& rStrm ); protected: public: - XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, sal_Bool bFilt ); + XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, bool bFilt ); virtual ~XclObjDropDown(); }; @@ -396,7 +396,7 @@ private: std::vector<ExcEScenarioCell> aCells; - sal_Bool Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt ); + bool Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt ); virtual void SaveCont( XclExpStream& rStrm ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index d35274cf0c87..002c4516369c 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -616,13 +616,13 @@ void XclObjComment::SaveXml( XclExpXmlStream& rStrm ) // --- class XclObjDropDown ------------------------------------------ -XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, sal_Bool bFilt ) : +XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, bool bFilt ) : XclObj( rObjMgr, EXC_OBJTYPE_DROPDOWN, true ), bIsFiltered( bFilt ) { - SetLocked( sal_True ); + SetLocked( true ); SetPrintable( false ); - SetAutoFill( sal_True ); + SetAutoFill( true ); SetAutoLine( false ); nGrbit |= 0x0100; // undocumented mrEscherEx.OpenContainer( ESCHER_SpContainer ); @@ -1262,7 +1262,7 @@ ExcEScenario::~ExcEScenario() { } -sal_Bool ExcEScenario::Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt ) +bool ExcEScenario::Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt ) { if( aCells.size() == EXC_SCEN_MAXCELL ) return false; @@ -1270,7 +1270,7 @@ sal_Bool ExcEScenario::Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& ExcEScenarioCell aCell(nCol, nRow, rTxt); aCells.push_back(aCell); nRecLen += 6 + aCell.GetStringBytes(); // 4 bytes address, 2 bytes ifmt - return sal_True; + return true; } void ExcEScenario::SaveCont( XclExpStream& rStrm ) |