diff options
30 files changed, 458 insertions, 479 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 7abad99bcc6f..e7cc2b664108 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -868,7 +868,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) if ( 0 != nFormatKey ) { XMLNumberFormatAttributesExportHelper aHelper(GetNumberFormatsSupplier(),*this); - sal_Bool bIsStandard = sal_False; + bool bIsStandard = false; ::rtl::OUString sEmpty; if ( util::NumberFormat::TEXT == aHelper.GetCellType(nFormatKey,bIsStandard) ) aHelper.SetNumberFormatAttributes(sEmpty, sEmpty); @@ -1468,7 +1468,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor if ( sToken.indexOf('"') == 0 && sToken.lastIndexOf('"') == sToken.getLength()-1 ) sToken = sToken.copy(1,sToken.getLength()-2); - sal_Bool bPrevCharIsSpace = sal_False; + bool bPrevCharIsSpace = false; GetTextParagraphExport()->exportText(sToken,bPrevCharIsSpace); } } @@ -1480,7 +1480,7 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor if ( xFT.is() ) { ::rtl::OUString sExpr = xFT->getLabel(); - sal_Bool bPrevCharIsSpace = sal_False; + bool bPrevCharIsSpace = false; GetTextParagraphExport()->exportText(sExpr,bPrevCharIsSpace); } } diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index 6509074dfc61..520c91016345 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -158,7 +158,7 @@ public: static sal_Bool IsNonAlienArrow( SdrObject* pObject ); ScDetectiveObjType GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab, - ScAddress& rPosition, ScRange& rSource, sal_Bool& rRedLine ); + ScAddress& rPosition, ScRange& rSource, bool& rRedLine ); void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition, const ScRange& rSource, sal_Bool bRedLine ); diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index a0a7f6d8fe78..f17fd7d1f871 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -1525,7 +1525,7 @@ void ScDetectiveFunc::UpdateAllArrowColors() ScAddress aPos; ScRange aSource; - sal_Bool bDummy; + bool bDummy; ScDetectiveObjType eType = GetDetectiveObjectType( pObject, nObjTab, aPos, aSource, bDummy ); if ( eType == SC_DETOBJ_ARROW || eType == SC_DETOBJ_TOOTHERTAB ) { @@ -1616,7 +1616,7 @@ sal_Bool ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRang } ScDetectiveObjType ScDetectiveFunc::GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab, - ScAddress& rPosition, ScRange& rSource, sal_Bool& rRedLine ) + ScAddress& rPosition, ScRange& rSource, bool& rRedLine ) { rRedLine = false; ScDetectiveObjType eType = SC_DETOBJ_NONE; @@ -1651,7 +1651,7 @@ ScDetectiveObjType ScDetectiveFunc::GetDetectiveObjectType( SdrObject* pObject, ColorData nObjColor = ((const XLineColorItem&)pObject->GetMergedItem(XATTR_LINECOLOR)).GetColorValue().GetColor(); if ( nObjColor == GetErrorColor() && nObjColor != GetArrowColor() ) - rRedLine = sal_True; + rRedLine = true; } else if ( pObject->ISA(SdrCircObj) ) { diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 46cf04cb4ecf..603001452513 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -145,7 +145,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction if (sComment.getLength()) { SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, false); - sal_Bool bPrevCharWasSpace(sal_True); + bool bPrevCharWasSpace(true); rExport.GetTextParagraphExport()->exportText(sComment, bPrevCharWasSpace); } } @@ -308,7 +308,7 @@ void ScChangeTrackingExportHelper::WriteStringCell(const ScBaseCell* pCell) if (sOUString.getLength()) { SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, false); - sal_Bool bPrevCharWasSpace(sal_True); + bool bPrevCharWasSpace(true); rExport.GetTextParagraphExport()->exportText(sOUString, bPrevCharWasSpace); } } @@ -395,7 +395,7 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con if (sOUValue.getLength()) { SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, false); - sal_Bool bPrevCharWasSpace(sal_True); + bool bPrevCharWasSpace(true); rExport.GetTextParagraphExport()->exportText(sOUValue, bPrevCharWasSpace); } } diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index c9c0f03f351a..87f961c809f5 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -76,7 +76,7 @@ void ScMyIteratorBase::UpdateAddress( table::CellAddress& rCellAddress ) //============================================================================== -sal_Bool ScMyShape::operator<(const ScMyShape& aShape) const +bool ScMyShape::operator<(const ScMyShape& aShape) const { if( aAddress.Tab() != aShape.aAddress.Tab() ) return (aAddress.Tab() < aShape.aAddress.Tab()); @@ -100,7 +100,7 @@ void ScMyShapesContainer::AddNewShape( const ScMyShape& aShape ) aShapeList.push_back(aShape); } -sal_Bool ScMyShapesContainer::GetFirstAddress( table::CellAddress& rCellAddress ) +bool ScMyShapesContainer::GetFirstAddress( table::CellAddress& rCellAddress ) { sal_Int32 nTable(rCellAddress.Sheet); if( !aShapeList.empty() ) @@ -139,7 +139,7 @@ void ScMyShapesContainer::Sort() aShapeList.sort(); } -sal_Bool ScMyNoteShape::operator<(const ScMyNoteShape& aNote) const +bool ScMyNoteShape::operator<(const ScMyNoteShape& aNote) const { if( aPos.Tab() != aNote.aPos.Tab() ) return (aPos.Tab() < aNote.aPos.Tab()); @@ -163,7 +163,7 @@ void ScMyNoteShapesContainer::AddNewNote( const ScMyNoteShape& aNote ) aNoteShapeList.push_back(aNote); } -sal_Bool ScMyNoteShapesContainer::GetFirstAddress( table::CellAddress& rCellAddress ) +bool ScMyNoteShapesContainer::GetFirstAddress( table::CellAddress& rCellAddress ) { sal_Int16 nTable = rCellAddress.Sheet; if( !aNoteShapeList.empty() ) @@ -202,7 +202,7 @@ void ScMyNoteShapesContainer::Sort() //============================================================================== -sal_Bool ScMyMergedRange::operator<(const ScMyMergedRange& aRange) const +bool ScMyMergedRange::operator<(const ScMyMergedRange& aRange) const { if( aCellRange.Sheet != aRange.aCellRange.Sheet ) return (aCellRange.Sheet < aRange.aCellRange.Sheet); @@ -228,7 +228,7 @@ void ScMyMergedRangesContainer::AddRange(const table::CellRangeAddress aMergedRa sal_Int32 nEndRow(aMergedRange.EndRow); ScMyMergedRange aRange; - aRange.bIsFirst = sal_True; + aRange.bIsFirst = true; aRange.aCellRange = aMergedRange; aRange.aCellRange.EndRow = nStartRow; aRange.nRows = nEndRow - nStartRow + 1; @@ -243,7 +243,7 @@ void ScMyMergedRangesContainer::AddRange(const table::CellRangeAddress aMergedRa } } -sal_Bool ScMyMergedRangesContainer::GetFirstAddress( table::CellAddress& rCellAddress ) +bool ScMyMergedRangesContainer::GetFirstAddress( table::CellAddress& rCellAddress ) { sal_Int32 nTable(rCellAddress.Sheet); if( !aRangeList.empty() ) @@ -294,7 +294,7 @@ void ScMyMergedRangesContainer::Sort() //============================================================================== -sal_Bool ScMyAreaLink::Compare( const ScMyAreaLink& rAreaLink ) const +bool ScMyAreaLink::Compare( const ScMyAreaLink& rAreaLink ) const { return (GetRowCount() == rAreaLink.GetRowCount()) && (sFilter == rAreaLink.sFilter) && @@ -303,7 +303,7 @@ sal_Bool ScMyAreaLink::Compare( const ScMyAreaLink& rAreaLink ) const (sSourceStr == rAreaLink.sSourceStr); } -sal_Bool ScMyAreaLink::operator<(const ScMyAreaLink& rAreaLink ) const +bool ScMyAreaLink::operator<(const ScMyAreaLink& rAreaLink ) const { if( aDestRange.Sheet != rAreaLink.aDestRange.Sheet ) return (aDestRange.Sheet < rAreaLink.aDestRange.Sheet); @@ -322,7 +322,7 @@ ScMyAreaLinksContainer::~ScMyAreaLinksContainer() { } -sal_Bool ScMyAreaLinksContainer::GetFirstAddress( table::CellAddress& rCellAddress ) +bool ScMyAreaLinksContainer::GetFirstAddress( table::CellAddress& rCellAddress ) { sal_Int32 nTable(rCellAddress.Sheet); if( !aAreaLinkList.empty() ) @@ -343,10 +343,10 @@ void ScMyAreaLinksContainer::SetCellData( ScMyCell& rMyCell ) ScUnoConversion::FillApiStartAddress( aAddress, aItr->aDestRange ); if( aAddress == rMyCell.aCellAddress ) { - rMyCell.bHasAreaLink = sal_True; + rMyCell.bHasAreaLink = true; rMyCell.aAreaLink = *aItr; aItr = aAreaLinkList.erase( aItr ); - sal_Bool bFound = sal_True; + bool bFound = true; while (aItr != aAreaLinkList.end() && bFound) { ScUnoConversion::FillApiStartAddress( aAddress, aItr->aDestRange ); @@ -381,7 +381,7 @@ ScMyCellRangeAddress::ScMyCellRangeAddress(const table::CellRangeAddress& rRange { } -sal_Bool ScMyCellRangeAddress::operator<(const ScMyCellRangeAddress& rRange ) const +bool ScMyCellRangeAddress::operator<(const ScMyCellRangeAddress& rRange ) const { if( Sheet != rRange.Sheet ) return (Sheet < rRange.Sheet); @@ -412,7 +412,7 @@ void ScMyEmptyDatabaseRangesContainer::AddNewEmptyDatabaseRange(const table::Cel } } -sal_Bool ScMyEmptyDatabaseRangesContainer::GetFirstAddress( table::CellAddress& rCellAddress ) +bool ScMyEmptyDatabaseRangesContainer::GetFirstAddress( table::CellAddress& rCellAddress ) { sal_Int32 nTable(rCellAddress.Sheet); if( !aDatabaseList.empty() ) @@ -433,7 +433,7 @@ void ScMyEmptyDatabaseRangesContainer::SetCellData( ScMyCell& rMyCell ) ScUnoConversion::FillApiStartAddress( aFirstAddress, *aItr ); if( aFirstAddress == rMyCell.aCellAddress ) { - rMyCell.bHasEmptyDatabase = sal_True; + rMyCell.bHasEmptyDatabase = true; if( aItr->StartColumn < aItr->EndColumn ) ++(aItr->StartColumn); else @@ -456,7 +456,7 @@ void ScMyEmptyDatabaseRangesContainer::Sort() //============================================================================== -sal_Bool ScMyDetectiveObj::operator<( const ScMyDetectiveObj& rDetObj) const +bool ScMyDetectiveObj::operator<( const ScMyDetectiveObj& rDetObj) const { if( aPosition.Sheet != rDetObj.aPosition.Sheet ) return (aPosition.Sheet < rDetObj.aPosition.Sheet); @@ -477,7 +477,7 @@ ScMyDetectiveObjContainer::~ScMyDetectiveObjContainer() void ScMyDetectiveObjContainer::AddObject( ScDetectiveObjType eObjType, const SCTAB nSheet, const ScAddress& rPosition, const ScRange& rSourceRange, - sal_Bool bHasError ) + bool bHasError ) { if( (eObjType == SC_DETOBJ_ARROW) || (eObjType == SC_DETOBJ_FROMOTHERTAB) || @@ -506,7 +506,7 @@ void ScMyDetectiveObjContainer::AddObject( ScDetectiveObjType eObjType, const SC } } -sal_Bool ScMyDetectiveObjContainer::GetFirstAddress( table::CellAddress& rCellAddress ) +bool ScMyDetectiveObjContainer::GetFirstAddress( table::CellAddress& rCellAddress ) { sal_Int32 nTable(rCellAddress.Sheet); if( !aDetectiveObjList.empty() ) @@ -544,7 +544,7 @@ void ScMyDetectiveObjContainer::Sort() //============================================================================== -sal_Bool ScMyDetectiveOp::operator<( const ScMyDetectiveOp& rDetOp) const +bool ScMyDetectiveOp::operator<( const ScMyDetectiveOp& rDetOp) const { if( aPosition.Sheet != rDetOp.aPosition.Sheet ) return (aPosition.Sheet < rDetOp.aPosition.Sheet); @@ -572,7 +572,7 @@ void ScMyDetectiveOpContainer::AddOperation( ScDetOpType eOpType, const ScAddres aDetectiveOpList.push_back( aDetOp ); } -sal_Bool ScMyDetectiveOpContainer::GetFirstAddress( table::CellAddress& rCellAddress ) +bool ScMyDetectiveOpContainer::GetFirstAddress( table::CellAddress& rCellAddress ) { sal_Int32 nTable(rCellAddress.Sheet); if( !aDetectiveOpList.empty() ) @@ -641,7 +641,7 @@ ScMyCell::~ScMyCell() //============================================================================== -sal_Bool ScMyExportAnnotation::operator<(const ScMyExportAnnotation& rAnno) const +bool ScMyExportAnnotation::operator<(const ScMyExportAnnotation& rAnno) const { if( aCellAddress.Row != rAnno.aCellAddress.Row ) return (aCellAddress.Row < rAnno.aCellAddress.Row); @@ -715,7 +715,7 @@ void ScMyNotEmptyCellsIterator::SetMatrixCellData( ScMyCell& rMyCell ) rMyCell.bIsMatrixCovered = false; rMyCell.bIsMatrixBase = false; - sal_Bool bIsMatrixBase(false); + bool bIsMatrixBase(false); ScAddress aScAddress; ScUnoConversion::FillScAddress( aScAddress, rMyCell.aCellAddress ); @@ -759,7 +759,7 @@ void ScMyNotEmptyCellsIterator::HasAnnotation(ScMyCell& aCell) { aCell.sAnnotationText = xSimpleText->getString(); if (aCell.sAnnotationText.getLength()) - aCell.bHasAnnotation = sal_True; + aCell.bHasAnnotation = true; } aAnnotations.erase(aItr); } @@ -834,7 +834,7 @@ void ScMyNotEmptyCellsIterator::SkipTable(SCTAB nSkip) pDetectiveOp->SkipTable(nSkip); } -sal_Bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles) +bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles) { table::CellAddress aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 ); @@ -854,7 +854,7 @@ sal_Bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles if( pDetectiveOp ) pDetectiveOp->UpdateAddress( aAddress ); - sal_Bool bFoundCell((aAddress.Column <= MAXCOL) && (aAddress.Row <= MAXROW)); + bool bFoundCell((aAddress.Column <= MAXCOL) && (aAddress.Row <= MAXROW)); if( bFoundCell ) { SetCellData( aCell, aAddress ); @@ -875,7 +875,7 @@ sal_Bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles HasAnnotation( aCell ); SetMatrixCellData( aCell ); - sal_Bool bIsAutoStyle; + bool bIsAutoStyle; // Ranges before the previous cell are not needed by ExportFormatRanges anymore and can be removed sal_Int32 nRemoveBeforeRow = aLastAddress.Row; aCell.nStyleIndex = pCellStyles->GetStyleNameIndex(aCell.aCellAddress.Sheet, diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index faa3e9bf75c2..e866f4a0c1c9 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -53,7 +53,7 @@ class ScBaseCell; class ScMyIteratorBase { protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0; + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0; public: ScMyIteratorBase(); @@ -75,7 +75,7 @@ struct ScMyShape sal_Int32 nEndY; com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape; - sal_Bool operator<(const ScMyShape& aShape) const; + bool operator<(const ScMyShape& aShape) const; }; typedef std::list<ScMyShape> ScMyShapeList; @@ -85,14 +85,14 @@ class ScMyShapesContainer : ScMyIteratorBase private: ScMyShapeList aShapeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyShapesContainer(); virtual ~ScMyShapesContainer(); using ScMyIteratorBase::UpdateAddress; void AddNewShape(const ScMyShape& aShape); - sal_Bool HasShapes() { return !aShapeList.empty(); } + bool HasShapes() { return !aShapeList.empty(); } const ScMyShapeList* GetShapes() const { return &aShapeList; } virtual void SetCellData( ScMyCell& rMyCell ); virtual void Sort(); @@ -104,7 +104,7 @@ struct ScMyNoteShape com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape; ScAddress aPos; - sal_Bool operator<(const ScMyNoteShape& aNote) const; + bool operator<(const ScMyNoteShape& aNote) const; }; typedef std::list<ScMyNoteShape> ScMyNoteShapeList; @@ -114,14 +114,14 @@ class ScMyNoteShapesContainer : ScMyIteratorBase private: ScMyNoteShapeList aNoteShapeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyNoteShapesContainer(); virtual ~ScMyNoteShapesContainer(); using ScMyIteratorBase::UpdateAddress; void AddNewNote(const ScMyNoteShape& aNote); - sal_Bool HasNotes() { return !aNoteShapeList.empty(); } + bool HasNotes() { return !aNoteShapeList.empty(); } const ScMyNoteShapeList* GetNotes() const { return &aNoteShapeList; } virtual void SetCellData( ScMyCell& rMyCell ); virtual void Sort(); @@ -134,8 +134,8 @@ struct ScMyMergedRange { com::sun::star::table::CellRangeAddress aCellRange; sal_Int32 nRows; - sal_Bool bIsFirst; - sal_Bool operator<(const ScMyMergedRange& aRange) const; + bool bIsFirst; + bool operator<(const ScMyMergedRange& aRange) const; }; typedef std::list<ScMyMergedRange> ScMyMergedRangeList; @@ -145,7 +145,7 @@ class ScMyMergedRangesContainer : ScMyIteratorBase private: ScMyMergedRangeList aRangeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyMergedRangesContainer(); virtual ~ScMyMergedRangesContainer(); @@ -173,8 +173,8 @@ struct ScMyAreaLink inline sal_Int32 GetColCount() const { return aDestRange.EndColumn - aDestRange.StartColumn + 1; } inline sal_Int32 GetRowCount() const { return aDestRange.EndRow - aDestRange.StartRow + 1; } - sal_Bool Compare( const ScMyAreaLink& rAreaLink ) const; - sal_Bool operator<(const ScMyAreaLink& rAreaLink ) const; + bool Compare( const ScMyAreaLink& rAreaLink ) const; + bool operator<(const ScMyAreaLink& rAreaLink ) const; }; typedef ::std::list< ScMyAreaLink > ScMyAreaLinkList; @@ -184,7 +184,7 @@ class ScMyAreaLinksContainer : ScMyIteratorBase private: ScMyAreaLinkList aAreaLinkList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyAreaLinksContainer(); virtual ~ScMyAreaLinksContainer(); @@ -203,7 +203,7 @@ public: struct ScMyCellRangeAddress : com::sun::star::table::CellRangeAddress { ScMyCellRangeAddress(const com::sun::star::table::CellRangeAddress& rRange); - sal_Bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const; + bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const; }; typedef std::list<ScMyCellRangeAddress> ScMyEmptyDatabaseRangeList; @@ -213,7 +213,7 @@ class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase private: ScMyEmptyDatabaseRangeList aDatabaseList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyEmptyDatabaseRangesContainer(); virtual ~ScMyEmptyDatabaseRangesContainer(); @@ -232,8 +232,8 @@ struct ScMyDetectiveObj ::com::sun::star::table::CellAddress aPosition; ::com::sun::star::table::CellRangeAddress aSourceRange; ScDetectiveObjType eObjType; - sal_Bool bHasError; - sal_Bool operator<(const ScMyDetectiveObj& rDetObj) const; + bool bHasError; + bool operator<(const ScMyDetectiveObj& rDetObj) const; }; typedef ::std::list< ScMyDetectiveObj > ScMyDetectiveObjList; @@ -242,9 +242,9 @@ typedef ::std::vector< ScMyDetectiveObj > ScMyDetectiveObjVec; class ScMyDetectiveObjContainer : ScMyIteratorBase { private: - ScMyDetectiveObjList aDetectiveObjList; + ScMyDetectiveObjList aDetectiveObjList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyDetectiveObjContainer(); virtual ~ScMyDetectiveObjContainer(); @@ -254,7 +254,7 @@ public: const SCTAB nSheet, const ScAddress& rPosition, const ScRange& rSourceRange, - sal_Bool bHasError ); + bool bHasError ); using ScMyIteratorBase::UpdateAddress; virtual void SetCellData( ScMyCell& rMyCell ); @@ -269,7 +269,7 @@ struct ScMyDetectiveOp ::com::sun::star::table::CellAddress aPosition; ScDetOpType eOpType; sal_Int32 nIndex; - sal_Bool operator<(const ScMyDetectiveOp& rDetOp) const; + bool operator<(const ScMyDetectiveOp& rDetOp) const; }; typedef ::std::list< ScMyDetectiveOp > ScMyDetectiveOpList; @@ -280,7 +280,7 @@ class ScMyDetectiveOpContainer : ScMyIteratorBase private: ScMyDetectiveOpList aDetectiveOpList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyDetectiveOpContainer(); virtual ~ScMyDetectiveOpContainer(); @@ -322,25 +322,25 @@ struct ScMyCell ScBaseCell* pBaseCell; - sal_Bool bIsAutoStyle; + bool bIsAutoStyle; - sal_Bool bHasShape; - sal_Bool bIsMergedBase; - sal_Bool bIsCovered; - sal_Bool bHasAreaLink; - sal_Bool bHasEmptyDatabase; - sal_Bool bHasDetectiveObj; - sal_Bool bHasDetectiveOp; + bool bHasShape; + bool bIsMergedBase; + bool bIsCovered; + bool bHasAreaLink; + bool bHasEmptyDatabase; + bool bHasDetectiveObj; + bool bHasDetectiveOp; - sal_Bool bIsEditCell; - sal_Bool bKnowWhetherIsEditCell; - sal_Bool bHasStringValue; - sal_Bool bHasDoubleValue; - sal_Bool bHasXText; + bool bIsEditCell; + bool bKnowWhetherIsEditCell; + bool bHasStringValue; + bool bHasDoubleValue; + bool bHasXText; - sal_Bool bIsMatrixBase; - sal_Bool bIsMatrixCovered; - sal_Bool bHasAnnotation; + bool bIsMatrixBase; + bool bIsMatrixCovered; + bool bHasAnnotation; ScMyCell(); ~ScMyCell(); @@ -352,7 +352,7 @@ struct ScMyExportAnnotation { com::sun::star::uno::Reference<com::sun::star::sheet::XSheetAnnotation> xAnnotation; com::sun::star::table::CellAddress aCellAddress; - sal_Bool operator<(const ScMyExportAnnotation& rAnno) const; + bool operator<(const ScMyExportAnnotation& rAnno) const; }; typedef ::std::list< ScMyExportAnnotation > ScMyExportAnnotationList; @@ -375,9 +375,9 @@ class ScMyNotEmptyCellsIterator ScXMLExport& rExport; ScHorizontalCellIterator* pCellItr; - SCCOL nCellCol; - SCROW nCellRow; - SCTAB nCurrentTable; + SCCOL nCellCol; + SCROW nCellRow; + SCTAB nCurrentTable; void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress ); void SetCellData( ScMyCell& rMyCell, ::com::sun::star::table::CellAddress& rAddress ); @@ -409,7 +409,7 @@ public: com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& rxTable); void SkipTable(SCTAB nSkip); - sal_Bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); + bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); }; #endif diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 0f90bc51d840..744da345af0c 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -72,7 +72,7 @@ ScMyValidation::~ScMyValidation() { } -sal_Bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const +bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const { if (aVal.bIgnoreBlanks == bIgnoreBlanks && aVal.bShowImputMessage == bShowImputMessage && @@ -89,7 +89,7 @@ sal_Bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const aVal.sImputMessage == sImputMessage && aVal.sFormula1 == sFormula1 && aVal.sFormula2 == sFormula2) - return sal_True; + return true; else return false; } @@ -120,10 +120,10 @@ ScMyValidationsContainer::~ScMyValidationsContainer() { } -sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, +bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, sal_Int32& nValidationIndex) { - sal_Bool bAdded(false); + bool bAdded(false); uno::Reference<beans::XPropertySet> xPropertySet(aTempAny, uno::UNO_QUERY); if (xPropertySet.is()) { @@ -135,8 +135,8 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, xPropertySet->getPropertyValue(sINPMESS) >>= sImputMessage; rtl::OUString sImputTitle; xPropertySet->getPropertyValue(sINPTITLE) >>= sImputTitle; - sal_Bool bShowErrorMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWERR)); - sal_Bool bShowImputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWINP)); + bool bShowErrorMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWERR)); + bool bShowImputMessage = ::cppu::any2bool(xPropertySet->getPropertyValue(sSHOWINP)); sheet::ValidationType aValidationType; xPropertySet->getPropertyValue(sTYPE) >>= aValidationType; if (bShowErrorMessage || bShowImputMessage || aValidationType != sheet::ValidationType_ANY || @@ -162,7 +162,7 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, aValidation.aBaseCell = xCondition->getSourcePosition(); } //ScMyValidationRange aValidationRange; - sal_Bool bEqualFound(false); + bool bEqualFound(false); sal_Int32 i(0); sal_Int32 nCount(aValidationVec.size()); while (i < nCount && !bEqualFound) @@ -182,7 +182,7 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, aValidation.sName += sCount; aValidationVec.push_back(aValidation); nValidationIndex = nCount; - bAdded = sal_True; + bAdded = true; } } } @@ -313,7 +313,7 @@ rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, con void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, const rtl::OUString& sTitle, const rtl::OUString& sOUMessage, - const sal_Bool bShowMessage, const sal_Bool bIsHelpMessage) + const bool bShowMessage, const bool bIsHelpMessage) { if (sTitle.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TITLE, sTitle); @@ -323,21 +323,21 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, XML_FALSE); SvXMLElementExport* pMessage(NULL); if (bIsHelpMessage) - pMessage = new SvXMLElementExport(rExport, XML_NAMESPACE_TABLE, XML_HELP_MESSAGE, sal_True, sal_True); + pMessage = new SvXMLElementExport(rExport, XML_NAMESPACE_TABLE, XML_HELP_MESSAGE, true, true); else - pMessage = new SvXMLElementExport(rExport, XML_NAMESPACE_TABLE, XML_ERROR_MESSAGE, sal_True, sal_True); + pMessage = new SvXMLElementExport(rExport, XML_NAMESPACE_TABLE, XML_ERROR_MESSAGE, true, true); if (sOUMessage.getLength()) { sal_Int32 i(0); rtl::OUStringBuffer sTemp; String sMessage(sOUMessage); rtl::OUString sText (sMessage.ConvertLineEnd(LINEEND_LF)); - sal_Bool bPrevCharWasSpace(sal_True); + bool bPrevCharWasSpace(true); while(i < sText.getLength()) { if ((sText[i] == '\n')) { - SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, false); + SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); rExport.GetTextParagraphExport()->exportText(sTemp.makeStringAndClear(), bPrevCharWasSpace); } else @@ -346,7 +346,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport, } if (sTemp.getLength()) { - SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, false); + SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); rExport.GetTextParagraphExport()->exportText(sTemp.makeStringAndClear(), bPrevCharWasSpace); } } @@ -358,7 +358,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) { if (!aValidationVec.empty()) { - SvXMLElementExport aElemVs(rExport, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS, sal_True, sal_True); + SvXMLElementExport aElemVs(rExport, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS, true, true); ScMyValidationVec::iterator aItr(aValidationVec.begin()); ScMyValidationVec::iterator aEndItr(aValidationVec.end()); while (aItr != aEndItr) @@ -391,10 +391,10 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) } } rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, GetBaseCellAddress(rExport.GetDocument(), aItr->aBaseCell)); - SvXMLElementExport aElemV(rExport, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, sal_True, sal_True); + SvXMLElementExport aElemV(rExport, XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, true, true); if (aItr->bShowImputMessage || aItr->sImputMessage.getLength() || aItr->sImputTitle.getLength()) { - WriteMessage(rExport, aItr->sImputTitle, aItr->sImputMessage, aItr->bShowImputMessage, sal_True); + WriteMessage(rExport, aItr->sImputTitle, aItr->sImputMessage, aItr->bShowImputMessage, true); } if (aItr->bShowErrorMessage || aItr->sErrorMessage.getLength() || aItr->sErrorTitle.getLength()) { @@ -426,7 +426,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TRUE); else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_EXECUTE, XML_FALSE); - SvXMLElementExport aEMElem(rExport, XML_NAMESPACE_TABLE, XML_ERROR_MACRO, sal_True, sal_True); + SvXMLElementExport aEMElem(rExport, XML_NAMESPACE_TABLE, XML_ERROR_MACRO, true, true); } { // #i47525# for a script URL the type and the property name for the URL @@ -469,7 +469,7 @@ const rtl::OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 sal_Int32 ScMyDefaultStyles::GetStyleNameIndex(const ScFormatRangeStyles* pCellStyles, const sal_Int32 nTable, const sal_Int32 nPos, - const sal_Int32 i, const sal_Bool bRow, sal_Bool& bIsAutoStyle) + const sal_Int32 i, const bool bRow, bool& bIsAutoStyle) { if (bRow) return pCellStyles->GetStyleNameIndex(nTable, nPos, i, @@ -482,7 +482,7 @@ sal_Int32 ScMyDefaultStyles::GetStyleNameIndex(const ScFormatRangeStyles* pCellS void ScMyDefaultStyles::FillDefaultStyles(const sal_Int32 nTable, const sal_Int32 nLastRow, const sal_Int32 nLastCol, const ScFormatRangeStyles* pCellStyles, ScDocument* pDoc, - const sal_Bool bRow) + const bool bRow) { if (pDoc) { @@ -500,9 +500,9 @@ void ScMyDefaultStyles::FillDefaultStyles(const sal_Int32 nTable, pDefaults = pColDefaults; nLast = nLastCol; } - sal_Bool bPrevAutoStyle(false); - sal_Bool bIsAutoStyle; - sal_Bool bResult; + bool bPrevAutoStyle(false); + bool bIsAutoStyle; + bool bResult; sal_Int32 nPrevIndex(0); sal_Int32 nIndex; sal_Int32 nRepeat(0); @@ -579,7 +579,7 @@ void ScMyDefaultStyles::FillDefaultStyles(const sal_Int32 nTable, if (pRowDefaults) delete pRowDefaults; pRowDefaults = new ScMyDefaultStyleList(nLastRow + 1); - FillDefaultStyles(nTable, nLastRow, nLastCol, pCellStyles, pDoc, sal_True); + FillDefaultStyles(nTable, nLastRow, nLastCol, pCellStyles, pDoc, true); if (pColDefaults) delete pColDefaults; pColDefaults = new ScMyDefaultStyleList(nLastCol + 1); @@ -600,11 +600,11 @@ ScMyRowFormatRange::ScMyRowFormatRange() nRepeatRows(0), nIndex(-1), nValidationIndex(-1), - bIsAutoStyle(sal_True) + bIsAutoStyle(true) { } -sal_Bool ScMyRowFormatRange::operator< (const ScMyRowFormatRange& rRange) const +bool ScMyRowFormatRange::operator< (const ScMyRowFormatRange& rRange) const { return (nStartColumn < rRange.nStartColumn); } @@ -636,14 +636,14 @@ void ScRowFormatRanges::Clear() } void ScRowFormatRanges::AddRange(const sal_Int32 nPrevStartCol, const sal_Int32 nRepeat, const sal_Int32 nPrevIndex, - const sal_Bool bPrevAutoStyle, const ScMyRowFormatRange& rFormatRange) + const bool bPrevAutoStyle, const ScMyRowFormatRange& rFormatRange) { sal_Int32 nIndex(-1); if ((nPrevIndex != rFormatRange.nIndex) || (bPrevAutoStyle != rFormatRange.bIsAutoStyle)) nIndex = rFormatRange.nIndex; - sal_Bool bInserted(false); + bool bInserted(false); if (!aRowFormatRanges.empty()) { ScMyRowFormatRange* pRange(&aRowFormatRanges.back()); @@ -657,7 +657,7 @@ void ScRowFormatRanges::AddRange(const sal_Int32 nPrevStartCol, const sal_Int32 if (rFormatRange.nRepeatRows < pRange->nRepeatRows) pRange->nRepeatRows = rFormatRange.nRepeatRows; pRange->nRepeatColumns += nRepeat; - bInserted = sal_True; + bInserted = true; } } } @@ -682,14 +682,14 @@ void ScRowFormatRanges::AddRange(ScMyRowFormatRange& rFormatRange, OSL_ENSURE(pColDefaults, "no column defaults"); sal_uInt32 nEnd (rFormatRange.nRepeatRows + nRow - 1); sal_Int32 nPrevIndex((*pRowDefaults)[nRow].nIndex); - sal_Bool bPrevAutoStyle((*pRowDefaults)[nRow].bIsAutoStyle); + bool bPrevAutoStyle((*pRowDefaults)[nRow].bIsAutoStyle); sal_uInt32 i(nRow + 1); - sal_Bool bReady(false); + bool bReady(false); while ((i < nEnd) && !bReady && (i < pRowDefaults->size())) { if ((nPrevIndex != (*pRowDefaults)[i].nIndex) || (bPrevAutoStyle != (*pRowDefaults)[i].bIsAutoStyle)) - bReady = sal_True; + bReady = true; else i += (*pRowDefaults)[i].nRepeat; } @@ -732,7 +732,7 @@ void ScRowFormatRanges::AddRange(ScMyRowFormatRange& rFormatRange, } } -sal_Bool ScRowFormatRanges::GetNext(ScMyRowFormatRange& aFormatRange) +bool ScRowFormatRanges::GetNext(ScMyRowFormatRange& aFormatRange) { ScMyRowFormatRangesList::iterator aItr(aRowFormatRanges.begin()); if (aItr != aRowFormatRanges.end()) @@ -740,7 +740,7 @@ sal_Bool ScRowFormatRanges::GetNext(ScMyRowFormatRange& aFormatRange) aFormatRange = (*aItr); aRowFormatRanges.erase(aItr); --nSize; - return sal_True; + return true; } return false; } @@ -780,14 +780,14 @@ void ScRowFormatRanges::Sort() ScMyFormatRange::ScMyFormatRange() : nStyleNameIndex(-1), nValidationIndex(-1), - bIsAutoStyle(sal_True) + bIsAutoStyle(true) { } -sal_Bool ScMyFormatRange::operator<(const ScMyFormatRange& rRange) const +bool ScMyFormatRange::operator<(const ScMyFormatRange& rRange) const { if (aRangeAddress.StartRow < rRange.aRangeAddress.StartRow) - return sal_True; + return true; else if (aRangeAddress.StartRow == rRange.aRangeAddress.StartRow) return (aRangeAddress.StartColumn < rRange.aRangeAddress.StartColumn); @@ -840,23 +840,23 @@ void ScFormatRangeStyles::AddNewTable(const sal_Int32 nTable) } } -sal_Bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& rIndex, const sal_Bool bIsAutoStyle) +bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& rIndex, const bool bIsAutoStyle) { if (bIsAutoStyle) { aAutoStyleNames.push_back(rpString); rIndex = aAutoStyleNames.size() - 1; - return sal_True; + return true; } else { sal_Int32 nCount(aStyleNames.size()); - sal_Bool bFound(false); + bool bFound(false); sal_Int32 i(nCount - 1); while ((i >= 0) && (!bFound)) { if (aStyleNames.at(i)->equals(*rpString)) - bFound = sal_True; + bFound = true; else i--; } @@ -869,29 +869,29 @@ sal_Bool ScFormatRangeStyles::AddStyleName(rtl::OUString* rpString, sal_Int32& r { aStyleNames.push_back(rpString); rIndex = aStyleNames.size() - 1; - return sal_True; + return true; } } } -sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, sal_Bool& bIsAutoStyle) +sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, bool& bIsAutoStyle) { sal_Int32 nPrefixLength(rPrefix.getLength()); rtl::OUString sTemp(rString.copy(nPrefixLength)); sal_Int32 nIndex(sTemp.toInt32()); if (nIndex > 0 && static_cast<size_t>(nIndex-1) < aAutoStyleNames.size() && aAutoStyleNames.at(nIndex - 1)->equals(rString)) { - bIsAutoStyle = sal_True; + bIsAutoStyle = true; return nIndex - 1; } else { sal_Int32 i(0); - sal_Bool bFound(false); + bool bFound(false); while (!bFound && static_cast<size_t>(i) < aStyleNames.size()) { if (aStyleNames[i]->equals(rString)) - bFound = sal_True; + bFound = true; else ++i; } @@ -906,13 +906,13 @@ sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const rtl::OUString& rString, while (!bFound && static_cast<size_t>(i) < aAutoStyleNames.size()) { if (aAutoStyleNames[i]->equals(rString)) - bFound = sal_True; + bFound = true; else ++i; } if (bFound) { - bIsAutoStyle = sal_True; + bIsAutoStyle = true; return i; } else @@ -922,7 +922,7 @@ sal_Int32 ScFormatRangeStyles::GetIndexOfStyleName(const rtl::OUString& rString, } sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_Int32 nTable, - const sal_Int32 nColumn, const sal_Int32 nRow, sal_Bool& bIsAutoStyle) const + const sal_Int32 nColumn, const sal_Int32 nRow, bool& bIsAutoStyle) const { OSL_ENSURE(static_cast<size_t>(nTable) < aTables.size(), "wrong table"); ScMyFormatRangeAddresses* pFormatRanges(aTables[nTable]); @@ -945,7 +945,7 @@ sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_Int32 nTable, } sal_Int32 ScFormatRangeStyles::GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nColumn, const sal_Int32 nRow, - sal_Bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& nNumberFormat, const sal_Int32 nRemoveBeforeRow) + bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& nNumberFormat, const sal_Int32 nRemoveBeforeRow) { OSL_ENSURE(static_cast<size_t>(nTable) < aTables.size(), "wrong table"); ScMyFormatRangeAddresses* pFormatRanges(aTables[nTable]); @@ -1053,7 +1053,7 @@ void ScFormatRangeStyles::GetFormatRanges(const sal_Int32 nStartColumn, const sa } void ScFormatRangeStyles::AddRangeStyleName(const table::CellRangeAddress aCellRangeAddress, - const sal_Int32 nStringIndex, const sal_Bool bIsAutoStyle, const sal_Int32 nValidationIndex, + const sal_Int32 nStringIndex, const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat) { ScMyFormatRange aFormatRange; @@ -1067,7 +1067,7 @@ void ScFormatRangeStyles::AddRangeStyleName(const table::CellRangeAddress aCellR pFormatRanges->push_back(aFormatRange); } -rtl::OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const sal_Bool bIsAutoStyle) +rtl::OUString* ScFormatRangeStyles::GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle) { if (bIsAutoStyle) return aAutoStyleNames[nIndex]; @@ -1117,11 +1117,11 @@ sal_Int32 ScColumnRowStylesBase::GetIndexOfStyleName(const rtl::OUString& rStrin else { sal_Int32 i(0); - sal_Bool bFound(false); + bool bFound(false); while (!bFound && static_cast<size_t>(i) < aStyleNames.size()) { if (aStyleNames.at(i)->equals(rString)) - bFound = sal_True; + bFound = true; else ++i; } @@ -1168,7 +1168,7 @@ void ScColumnStyles::AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields } sal_Int32 ScColumnStyles::GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField, - sal_Bool& bIsVisible) + bool& bIsVisible) { OSL_ENSURE(static_cast<size_t>(nTable) < aTables.size(), "wrong table"); if (static_cast<size_t>(nField) < aTables[nTable].size()) @@ -1184,7 +1184,7 @@ sal_Int32 ScColumnStyles::GetStyleNameIndex(const sal_Int32 nTable, const sal_In } void ScColumnStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, - const sal_Int32 nStringIndex, const sal_Bool bIsVisible) + const sal_Int32 nStringIndex, const bool bIsVisible) { OSL_ENSURE(static_cast<size_t>(nTable) < aTables.size(), "wrong table"); OSL_ENSURE(aTables[nTable].size() >= static_cast<sal_uInt32>(nField), "wrong field"); @@ -1198,7 +1198,7 @@ void ScColumnStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 n rtl::OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) { - sal_Bool bTemp; + bool bTemp; return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField, bTemp)); } diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index e3baa64cb68c..228382831628 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -58,14 +58,14 @@ struct ScMyValidation com::sun::star::sheet::ValidationType aValidationType; com::sun::star::sheet::ConditionOperator aOperator; sal_Int16 nShowList; - sal_Bool bShowErrorMessage; - sal_Bool bShowImputMessage; - sal_Bool bIgnoreBlanks; + bool bShowErrorMessage; + bool bShowImputMessage; + bool bIgnoreBlanks; ScMyValidation(); ~ScMyValidation(); - sal_Bool IsEqual(const ScMyValidation& aVal) const; + bool IsEqual(const ScMyValidation& aVal) const; }; typedef std::vector<ScMyValidation> ScMyValidationVec; @@ -95,13 +95,13 @@ private: public: ScMyValidationsContainer(); ~ScMyValidationsContainer(); - sal_Bool AddValidation(const com::sun::star::uno::Any& aAny, + bool AddValidation(const com::sun::star::uno::Any& aAny, sal_Int32& nValidationIndex); rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); void WriteMessage(ScXMLExport& rExport, const rtl::OUString& sTitle, const rtl::OUString& sMessage, - const sal_Bool bShowMessage, const sal_Bool bIsHelpMessage); + const bool bShowMessage, const bool bIsHelpMessage); void WriteValidations(ScXMLExport& rExport); const rtl::OUString& GetValidationName(const sal_Int32 nIndex); }; @@ -112,10 +112,10 @@ struct ScMyDefaultStyle { sal_Int32 nIndex; sal_Int32 nRepeat; - sal_Bool bIsAutoStyle; + bool bIsAutoStyle; ScMyDefaultStyle() : nIndex(-1), nRepeat(1), - bIsAutoStyle(sal_True) {} + bIsAutoStyle(true) {} }; typedef std::vector<ScMyDefaultStyle> ScMyDefaultStyleList; @@ -129,11 +129,11 @@ class ScMyDefaultStyles sal_Int32 GetStyleNameIndex(const ScFormatRangeStyles* pCellStyles, const sal_Int32 nTable, const sal_Int32 nPos, - const sal_Int32 i, const sal_Bool bRow, sal_Bool& bIsAutoStyle); + const sal_Int32 i, const bool bRow, bool& bIsAutoStyle); void FillDefaultStyles(const sal_Int32 nTable, const sal_Int32 nLastRow, const sal_Int32 nLastCol, const ScFormatRangeStyles* pCellStyles, ScDocument* pDoc, - const sal_Bool bRow); + const bool bRow); public: ScMyDefaultStyles() : pRowDefaults(NULL), pColDefaults(NULL) {} ~ScMyDefaultStyles(); @@ -153,10 +153,10 @@ struct ScMyRowFormatRange sal_Int32 nRepeatRows; sal_Int32 nIndex; sal_Int32 nValidationIndex; - sal_Bool bIsAutoStyle; + bool bIsAutoStyle; ScMyRowFormatRange(); - sal_Bool operator<(const ScMyRowFormatRange& rRange) const; + bool operator<(const ScMyRowFormatRange& rRange) const; }; class ScRowFormatRanges @@ -168,7 +168,7 @@ class ScRowFormatRanges sal_uInt32 nSize; void AddRange(const sal_Int32 nPrevStartCol, const sal_Int32 nRepeat, const sal_Int32 nPrevIndex, - const sal_Bool bPrevAutoStyle, const ScMyRowFormatRange& rFormatRange); + const bool bPrevAutoStyle, const ScMyRowFormatRange& rFormatRange); public: ScRowFormatRanges(); @@ -179,7 +179,7 @@ public: void SetColDefaults(const ScMyDefaultStyleList* pDefaults) { pColDefaults = pDefaults; } void Clear(); void AddRange(ScMyRowFormatRange& rFormatRange, const sal_Int32 nStartRow); - sal_Bool GetNext(ScMyRowFormatRange& rFormatRange); + bool GetNext(ScMyRowFormatRange& rFormatRange); sal_Int32 GetMaxRows() const; sal_Int32 GetSize() const; void Sort(); @@ -193,10 +193,10 @@ struct ScMyFormatRange sal_Int32 nStyleNameIndex; sal_Int32 nValidationIndex; sal_Int32 nNumberFormat; - sal_Bool bIsAutoStyle; + bool bIsAutoStyle; ScMyFormatRange(); - sal_Bool operator< (const ScMyFormatRange& rRange) const; + bool operator< (const ScMyFormatRange& rRange) const; }; class ScFormatRangeStyles @@ -217,19 +217,19 @@ public: void SetRowDefaults(const ScMyDefaultStyleList* pDefaults) { pRowDefaults = pDefaults; } void SetColDefaults(const ScMyDefaultStyleList* pDefaults) { pColDefaults = pDefaults; } void AddNewTable(const sal_Int32 nTable); - sal_Bool AddStyleName(rtl::OUString* pString, sal_Int32& rIndex, const sal_Bool bIsAutoStyle = sal_True); - sal_Int32 GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, sal_Bool& bIsAutoStyle); + bool AddStyleName(rtl::OUString* pString, sal_Int32& rIndex, const bool bIsAutoStyle = true); + sal_Int32 GetIndexOfStyleName(const rtl::OUString& rString, const rtl::OUString& rPrefix, bool& bIsAutoStyle); // does not delete ranges sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nColumn, const sal_Int32 nRow, - sal_Bool& bIsAutoStyle) const; + bool& bIsAutoStyle) const; // deletes not necessary ranges if wanted sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nColumn, const sal_Int32 nRow, - sal_Bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& nNumberFormat, const sal_Int32 nRemoveBeforeRow); + bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& nNumberFormat, const sal_Int32 nRemoveBeforeRow); void GetFormatRanges(const sal_Int32 nStartColumn, const sal_Int32 nEndColumn, const sal_Int32 nRow, const sal_Int32 nTable, ScRowFormatRanges* pFormatRanges); void AddRangeStyleName(const com::sun::star::table::CellRangeAddress aCellRangeAddress, const sal_Int32 nStringIndex, - const sal_Bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat); - rtl::OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const sal_Bool bIsAutoStyle); + const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat); + rtl::OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); void Sort(); }; @@ -251,9 +251,9 @@ public: struct ScColumnStyle { sal_Int32 nIndex; - sal_Bool bIsVisible; + bool bIsVisible; - ScColumnStyle() : nIndex(-1), bIsVisible(sal_True) {} + ScColumnStyle() : nIndex(-1), bIsVisible(true) {} }; class ScColumnStyles : public ScColumnRowStylesBase @@ -268,8 +268,8 @@ public: virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields); sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField, - sal_Bool& bIsVisible); - void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const sal_Bool bIsVisible); + bool& bIsVisible); + void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const bool bIsVisible); virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index f38f442ef8bb..59c1450809fc 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -67,7 +67,6 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, SvXMLImportContext( rImport, nPrfx, rLName ), mrAnnotationData( rAnnotationData ), nParagraphCount(0), - bHasTextP(false), pCellContext(pTempCellContext), pShapeContext(NULL) { @@ -77,7 +76,7 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, XMLTableShapeImportHelper* pTableShapeImport = (XMLTableShapeImportHelper*)GetScImport().GetShapeImport().get(); pTableShapeImport->SetAnnotation(this); pShapeContext = GetScImport().GetShapeImport()->CreateGroupChildContext( - GetScImport(), nPrfx, rLName, xAttrList, xLocalShapes, sal_True); + GetScImport(), nPrfx, rLName, xAttrList, xLocalShapes, true); } pCellContext = pTempCellContext; @@ -171,8 +170,7 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPref void ScXMLAnnotationContext::Characters( const ::rtl::OUString& rChars ) { - if (!bHasTextP) - maTextBuffer.append(rChars); + maTextBuffer.append(rChars); } void ScXMLAnnotationContext::EndElement() diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index d343a715955c..62b871303b99 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -110,7 +110,6 @@ private: rtl::OUStringBuffer maCreateDateBuffer; rtl::OUStringBuffer maCreateDateStringBuffer; sal_Int32 nParagraphCount; - sal_Bool bHasTextP; ScXMLTableRowCellContext* pCellContext; SvXMLImportContext* pShapeContext; diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 30e0f4f50b4a..44430d5ce758 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -152,32 +152,16 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext *pContext = 0; const SvXMLTokenMap& rTokenMap = GetScImport().GetBodyElemTokenMap(); -// sal_Bool bOrdered = sal_False; -// sal_Bool bHeading = sal_False; switch( rTokenMap.Get( nPrefix, rLocalName ) ) { -// case XML_TOK_TEXT_H: -// bHeading = sal_True; -// case XML_TOK_TEXT_P: -// pContext = new SwXMLParaContext( GetSwImport(),nPrefix, rLocalName, -// xAttrList, bHeading ); -// break; -// case XML_TOK_TEXT_ORDERED_LIST: -// bOrdered = sal_True; -// case XML_TOK_TEXT_UNORDERED_LIST: -// pContext = new SwXMLListBlockContext( GetSwImport(),nPrefix, rLocalName, -// xAttrList, bOrdered ); -// break; case XML_TOK_BODY_TRACKED_CHANGES : - { pChangeTrackingImportHelper = GetScImport().GetChangeTrackingImportHelper(); if (pChangeTrackingImportHelper) pContext = new ScXMLTrackedChangesContext( GetScImport(), nPrefix, rLocalName, xAttrList, pChangeTrackingImportHelper); - } - break; + break; case XML_TOK_BODY_CALCULATION_SETTINGS : pContext = new ScXMLCalculationSettingsContext( GetScImport(), nPrefix, rLocalName, xAttrList ); - bHadCalculationSettings = sal_True; + bHadCalculationSettings = true; break; case XML_TOK_BODY_CONTENT_VALIDATIONS : pContext = new ScXMLContentValidationsContext( GetScImport(), nPrefix, rLocalName, xAttrList ); @@ -186,17 +170,15 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, pContext = new ScXMLLabelRangesContext( GetScImport(), nPrefix, rLocalName, xAttrList ); break; case XML_TOK_BODY_TABLE: + if (GetScImport().GetTables().GetCurrentSheet() >= MAXTAB) { - if (GetScImport().GetTables().GetCurrentSheet() >= MAXTAB) - { - GetScImport().SetRangeOverflowType(SCWARN_IMPORT_SHEET_OVERFLOW); - pContext = new ScXMLEmptyContext(GetScImport(), nPrefix, rLocalName); - } - else - { - pContext = new ScXMLTableContext( GetScImport(),nPrefix, rLocalName, - xAttrList ); - } + GetScImport().SetRangeOverflowType(SCWARN_IMPORT_SHEET_OVERFLOW); + pContext = new ScXMLEmptyContext(GetScImport(), nPrefix, rLocalName); + } + else + { + pContext = new ScXMLTableContext( GetScImport(),nPrefix, rLocalName, + xAttrList ); } break; case XML_TOK_BODY_NAMED_EXPRESSIONS: diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 61db1ae58924..d8d8364cb627 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -42,8 +42,8 @@ class ScXMLBodyContext : public SvXMLImportContext rtl::OUString sPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; - sal_Bool bProtected; - sal_Bool bHadCalculationSettings; + bool bProtected; + bool bHadCalculationSettings; ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index b826fe0778f6..99d6ddb018ad 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -68,15 +68,15 @@ class ScXMLTableRowCellContext : public SvXMLImportContext ScXMLImport& rXMLImport; formula::FormulaGrammar::Grammar eGrammar; sal_Int16 nCellType; - bool bIsMerged; - bool bIsMatrix; - bool bHasSubTable; - bool bIsCovered; - bool bIsEmpty; - bool bHasTextImport; - bool bIsFirstTextImport; - bool bSolarMutexLocked; - bool bFormulaTextResult; + bool bIsMerged; + bool bIsMatrix; + bool bHasSubTable; + bool bIsCovered; + bool bIsEmpty; + bool bHasTextImport; + bool bIsFirstTextImport; + bool bSolarMutexLocked; + bool bFormulaTextResult; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 4249f26b6684..29ed1eb4336d 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -143,7 +143,7 @@ void ScXMLTableColContext::EndElement() if ( pStyles ) { XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_COLUMN, sStyleName, sal_True); + XML_STYLE_FAMILY_TABLE_COLUMN, sStyleName, true); if (pStyle) { pStyle->FillPropertySet(xColumnProperties); @@ -158,7 +158,7 @@ void ScXMLTableColContext::EndElement() } } rtl::OUString sVisible(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLVIS)); - sal_Bool bValue(sal_True); + bool bValue(true); if (!IsXMLToken(sVisibility, XML_VISIBLE)) bValue = false; xColumnProperties->setPropertyValue(sVisible, uno::makeAny(bValue)); @@ -180,7 +180,7 @@ ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const sal_Bool bTempHeader, const sal_Bool bTempGroup) : + const bool bTempHeader, const bool bTempGroup) : SvXMLImportContext( rImport, nPrfx, rLName ), nHeaderStartCol(0), nHeaderEndCol(0), @@ -188,7 +188,7 @@ ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, nGroupEndCol(0), bHeader(bTempHeader), bGroup(bTempGroup), - bGroupDisplay(sal_True) + bGroupDisplay(true) { // don't have any attributes if (bHeader) @@ -231,12 +231,12 @@ SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( sal_uInt16 nPrefi case XML_TOK_TABLE_COLS_COL_GROUP: pContext = new ScXMLTableColsContext( GetScImport(), nPrefix, rLName, xAttrList, - false, sal_True ); + false, true ); break; case XML_TOK_TABLE_COLS_HEADER_COLS: pContext = new ScXMLTableColsContext( GetScImport(), nPrefix, rLName, xAttrList, - sal_True, false ); + true, false ); break; case XML_TOK_TABLE_COLS_COLS: pContext = new ScXMLTableColsContext( GetScImport(), nPrefix, @@ -271,7 +271,7 @@ void ScXMLTableColsContext::EndElement() { if (!xPrintAreas->getPrintTitleColumns()) { - xPrintAreas->setPrintTitleColumns(sal_True); + xPrintAreas->setPrintTitleColumns(true); table::CellRangeAddress aColumnHeaderRange; aColumnHeaderRange.StartColumn = nHeaderStartCol; aColumnHeaderRange.EndColumn = nHeaderEndCol; @@ -297,7 +297,7 @@ void ScXMLTableColsContext::EndElement() if (pDoc) { ScXMLImport::MutexGuard aGuard(GetScImport()); - ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(nSheet, sal_True); + ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(nSheet, true); ScOutlineArray* pColArray = pOutlineTable ? pOutlineTable->GetColArray() : NULL; if (pColArray) { diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 6c958bc673bd..007c3936970c 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -66,9 +66,9 @@ class ScXMLTableColsContext : public SvXMLImportContext sal_Int32 nHeaderEndCol; sal_Int32 nGroupStartCol; sal_Int32 nGroupEndCol; - sal_Bool bHeader; - sal_Bool bGroup; - sal_Bool bGroupDisplay; + bool bHeader; + bool bGroup; + bool bGroupDisplay; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -79,7 +79,7 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const sal_Bool bHeader, const sal_Bool bGroup); + const bool bHeader, const bool bGroup); virtual ~ScXMLTableColsContext(); diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 25230f6fd47d..d79dbed730e0 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -133,19 +133,19 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, nSubTotalsUserListIndex(0), bContainsSort(false), bContainsSubTotal(false), - bNative(sal_True), + bNative(true), bIsSelection(false), bKeepFormats(false), bMoveCells(false), bStripData(false), - bContainsHeader(sal_True), + bContainsHeader(true), bAutoFilter(false), bSubTotalsBindFormatsToContent(false), bSubTotalsIsCaseSensitive(false), bSubTotalsInsertPageBreaks(false), bSubTotalsSortGroups(false), bSubTotalsEnabledUserList(false), - bSubTotalsAscending(sal_True), + bSubTotalsAscending(true), bFilterCopyOutputData(false), bFilterIsCaseSensitive(false), bFilterSkipDuplicates(false), @@ -268,14 +268,14 @@ SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( sal_uInt16 nP break; case XML_TOK_SORT : { - bContainsSort = sal_True; + bContainsSort = true; pContext = new ScXMLSortContext( GetScImport(), nPrefix, rLName, xAttrList, this); } break; case XML_TOK_DATABASE_RANGE_SUBTOTAL_RULES : { - bContainsSubTotal = sal_True; + bContainsSubTotal = true; pContext = new ScXMLSubTotalRulesContext( GetScImport(), nPrefix, rLName, xAttrList, this); } @@ -867,7 +867,7 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, SvXMLImportContext( rImport, nPrfx, rLName ), pDatabaseRangeContext(pTempDatabaseRangeContext) { - pDatabaseRangeContext->SetSubTotalsSortGroups(sal_True); + pDatabaseRangeContext->SetSubTotalsSortGroups(true); sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetSubTotalRulesSortGroupsAttrTokenMap(); for( sal_Int16 i=0; i < nAttrCount; ++i ) @@ -887,7 +887,7 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, rtl::OUString sTemp = sValue.copy(0, 8); if (sTemp.compareToAscii(SC_USERLIST) == 0) { - pDatabaseRangeContext->SetSubTotalsEnabledUserList(sal_True); + pDatabaseRangeContext->SetSubTotalsEnabledUserList(true); sTemp = sValue.copy(8); pDatabaseRangeContext->SetSubTotalsUserListIndex(static_cast<sal_Int16>(sTemp.toInt32())); } @@ -912,7 +912,7 @@ ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, case XML_TOK_SORT_GROUPS_ATTR_ORDER : { if (IsXMLToken(sValue, XML_ASCENDING)) - pDatabaseRangeContext->SetSubTotalsAscending(sal_True); + pDatabaseRangeContext->SetSubTotalsAscending(true); else pDatabaseRangeContext->SetSubTotalsAscending(false); } diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 7642ef4e2a71..22cf214c2f08 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -89,26 +89,26 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext sal_Int32 nRefresh; sal_Int16 nSubTotalsUserListIndex; sal_Int16 nSubTotalRuleGroupFieldNumber; - sal_Bool bContainsSort; - sal_Bool bContainsSubTotal; - sal_Bool bNative; - sal_Bool bIsSelection; - sal_Bool bKeepFormats; - sal_Bool bMoveCells; - sal_Bool bStripData; - sal_Bool bContainsHeader; - sal_Bool bAutoFilter; - sal_Bool bSubTotalsBindFormatsToContent; - sal_Bool bSubTotalsIsCaseSensitive; - sal_Bool bSubTotalsInsertPageBreaks; - sal_Bool bSubTotalsSortGroups; - sal_Bool bSubTotalsEnabledUserList; - sal_Bool bSubTotalsAscending; - sal_Bool bFilterCopyOutputData; - sal_Bool bFilterIsCaseSensitive; - sal_Bool bFilterSkipDuplicates; - sal_Bool bFilterUseRegularExpressions; - sal_Bool bFilterConditionSourceRange; + bool bContainsSort; + bool bContainsSubTotal; + bool bNative; + bool bIsSelection; + bool bKeepFormats; + bool bMoveCells; + bool bStripData; + bool bContainsHeader; + bool bAutoFilter; + bool bSubTotalsBindFormatsToContent; + bool bSubTotalsIsCaseSensitive; + bool bSubTotalsInsertPageBreaks; + bool bSubTotalsSortGroups; + bool bSubTotalsEnabledUserList; + bool bSubTotalsAscending; + bool bFilterCopyOutputData; + bool bFilterIsCaseSensitive; + bool bFilterSkipDuplicates; + bool bFilterUseRegularExpressions; + bool bFilterConditionSourceRange; ScDBCollection::RangeType meRangeType; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -136,24 +136,24 @@ public: void SetConnectionRessource(const rtl::OUString sTempConRes) { sConnectionRessource = sTempConRes; } void SetSourceObject(const rtl::OUString sTempSourceObject) { sSourceObject = sTempSourceObject; } void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } - void SetNative(const sal_Bool bTempNative) { bNative = bTempNative; } - void SetSubTotalsBindFormatsToContent(const sal_Bool bTemp ) { bSubTotalsBindFormatsToContent = bTemp; } - void SetSubTotalsIsCaseSensitive(const sal_Bool bTemp) { bSubTotalsIsCaseSensitive = bTemp; } - void SetSubTotalsInsertPageBreaks(const sal_Bool bTemp) { bSubTotalsInsertPageBreaks = bTemp; } - void SetSubTotalsEnabledUserList(const sal_Bool bTemp) { bSubTotalsEnabledUserList = bTemp; } + void SetNative(const bool bTempNative) { bNative = bTempNative; } + void SetSubTotalsBindFormatsToContent(const bool bTemp ) { bSubTotalsBindFormatsToContent = bTemp; } + void SetSubTotalsIsCaseSensitive(const bool bTemp) { bSubTotalsIsCaseSensitive = bTemp; } + void SetSubTotalsInsertPageBreaks(const bool bTemp) { bSubTotalsInsertPageBreaks = bTemp; } + void SetSubTotalsEnabledUserList(const bool bTemp) { bSubTotalsEnabledUserList = bTemp; } void SetSubTotalsUserListIndex(const sal_Int16 nTemp) { nSubTotalsUserListIndex = nTemp; } - void SetSubTotalsAscending(const sal_Bool bTemp) { bSubTotalsAscending = bTemp; } - void SetSubTotalsSortGroups(const sal_Bool bTemp) { bSubTotalsSortGroups = bTemp; } + void SetSubTotalsAscending(const bool bTemp) { bSubTotalsAscending = bTemp; } + void SetSubTotalsSortGroups(const bool bTemp) { bSubTotalsSortGroups = bTemp; } void AddSubTotalRule(const ScSubTotalRule& rRule) { aSubTotalRules.push_back(rRule); } void SetSortSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& aTempSortSequence) { aSortSequence = aTempSortSequence; } - void SetFilterCopyOutputData(const sal_Bool bTemp) { bFilterCopyOutputData = bTemp; } - void SetFilterIsCaseSensitive(const sal_Bool bTemp) { bFilterIsCaseSensitive = bTemp; } - void SetFilterSkipDuplicates(const sal_Bool bTemp) { bFilterSkipDuplicates = bTemp; } - void SetFilterUseRegularExpressions(const sal_Bool bTemp) { bFilterUseRegularExpressions = bTemp; } + void SetFilterCopyOutputData(const bool bTemp) { bFilterCopyOutputData = bTemp; } + void SetFilterIsCaseSensitive(const bool bTemp) { bFilterIsCaseSensitive = bTemp; } + void SetFilterSkipDuplicates(const bool bTemp) { bFilterSkipDuplicates = bTemp; } + void SetFilterUseRegularExpressions(const bool bTemp) { bFilterUseRegularExpressions = bTemp; } void SetFilterFields(const com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2>& aTemp) { aFilterFields = aTemp; } void SetFilterOutputPosition(const com::sun::star::table::CellAddress& aTemp) { aFilterOutputPosition = aTemp; } void SetFilterConditionSourceRangeAddress(const com::sun::star::table::CellRangeAddress& aTemp) { aFilterConditionSourceRangeAddress = aTemp; - bFilterConditionSourceRange = sal_True; } + bFilterConditionSourceRange = true; } }; class ScXMLSourceSQLContext : public SvXMLImportContext diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 850173b3b234..51ac34190462 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -616,7 +616,7 @@ sal_Int32 ScXMLExport::GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const return itr->second; } -sal_Bool ScXMLExport::HasDrawPages(uno::Reference <sheet::XSpreadsheetDocument>& xDoc) +bool ScXMLExport::HasDrawPages(uno::Reference <sheet::XSpreadsheetDocument>& xDoc) { uno::Reference <beans::XPropertySet> xDocProps( xDoc, uno::UNO_QUERY ); return (xDocProps.is() && ::cppu::any2bool( xDocProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_HASDRAWPAGES))) )); @@ -739,7 +739,7 @@ void ScXMLExport::CollectShapesAutoStyles(const sal_Int32 nTableCount) if( xFormsSupplier.is() && xFormsSupplier->hasForms() ) { GetFormExport()->examineForms(xDrawPage); - pSharedData->SetDrawPageHasForms(nTable, sal_True); + pSharedData->SetDrawPageHasForms(nTable, true); } ScMyTableShapes* pTableShapes(pSharedData->GetTableShapes()); if (pTableShapes) @@ -833,7 +833,7 @@ table::CellRangeAddress ScXMLExport::GetEndAddress(const uno::Reference<sheet::X uno::Reference<sheet::XCellRangeAddressable> xCellAddress (xCursor, uno::UNO_QUERY); if (xUsedArea.is() && xCellAddress.is()) { - xUsedArea->gotoEndOfUsedArea(sal_True); + xUsedArea->gotoEndOfUsedArea(true); aCellAddress = xCellAddress->getRangeAddress(); } return aCellAddress; @@ -909,7 +909,7 @@ void ScXMLExport::GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp ) } void ScXMLExport::WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_Int32 nStyleIndex, - const sal_Int32 nIndex, const sal_Bool bIsAutoStyle, const sal_Bool bIsVisible) + const sal_Int32 nIndex, const bool bIsAutoStyle, const bool bIsVisible) { CheckAttrList(); AddAttribute(sAttrStyleName, *pColumnStyles->GetStyleNameByIndex(nStyleIndex)); @@ -922,15 +922,15 @@ void ScXMLExport::WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_In } if (nIndex != -1) AddAttribute(XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, *pCellStyles->GetStyleNameByIndex(nIndex, bIsAutoStyle)); - SvXMLElementExport aElemC(*this, sElemCol, sal_True, sal_True); + SvXMLElementExport aElemC(*this, sElemCol, true, true); } void ScXMLExport::WriteColumn(const sal_Int32 nColumn, const sal_Int32 nRepeatColumns, - const sal_Int32 nStyleIndex, const sal_Bool bIsVisible) + const sal_Int32 nStyleIndex, const bool bIsVisible) { sal_Int32 nRepeat(1); sal_Int32 nPrevIndex((*pDefaults->GetColDefaults())[nColumn].nIndex); - sal_Bool bPrevAutoStyle((*pDefaults->GetColDefaults())[nColumn].bIsAutoStyle); + bool bPrevAutoStyle((*pDefaults->GetColDefaults())[nColumn].bIsAutoStyle); for (sal_Int32 i = nColumn + 1; i < nColumn + nRepeatColumns; ++i) { if (((*pDefaults->GetColDefaults())[i].nIndex != nPrevIndex) || @@ -949,30 +949,30 @@ void ScXMLExport::WriteColumn(const sal_Int32 nColumn, const sal_Int32 nRepeatCo void ScXMLExport::OpenHeaderColumn() { - StartElement( XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, sal_True ); + StartElement( XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, true ); } void ScXMLExport::CloseHeaderColumn() { - EndElement(XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, sal_True); + EndElement(XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, true); } -void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAddress& aColumnHeaderRange, const sal_Bool bHasColumnHeader) +void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAddress& aColumnHeaderRange, const bool bHasColumnHeader) { sal_Int32 nColsRepeated (1); rtl::OUString sParent; sal_Int32 nIndex; sal_Int32 nPrevColumn(0); - sal_Bool bPrevIsVisible (sal_True); - sal_Bool bWasHeader (false); - sal_Bool bIsHeader (false); - sal_Bool bIsClosed (sal_True); + bool bPrevIsVisible (true); + bool bWasHeader (false); + bool bIsHeader (false); + bool bIsClosed (true); sal_Int32 nPrevIndex (-1); sal_Int32 nColumn; for (nColumn = 0; nColumn <= pSharedData->GetLastColumn(nTable); ++nColumn) { CheckAttrList(); - sal_Bool bIsVisible(sal_True); + bool bIsVisible(true); nIndex = pColumnStyles->GetStyleNameIndex(nTable, nColumn, bIsVisible); bIsHeader = bHasColumnHeader && (aColumnHeaderRange.StartColumn <= nColumn) && (nColumn <= aColumnHeaderRange.EndColumn); @@ -993,7 +993,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd if(pGroupColumns->IsGroupStart(nColumn)) pGroupColumns->OpenGroups(nColumn); OpenHeaderColumn(); - bWasHeader = sal_True; + bWasHeader = true; bIsClosed = false; } else @@ -1009,7 +1009,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd nPrevColumn = nColumn; nColsRepeated = 1; bWasHeader = false; - bIsClosed = sal_True; + bIsClosed = true; } } else if (nColumn == 0) @@ -1096,7 +1096,7 @@ void ScXMLExport::ExportExternalRefCacheStyles() } else { - sal_Bool bIsAuto; + bool bIsAuto; nIndex = pCellStyles->GetIndexOfStyleName( aName, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)), bIsAuto); } @@ -1115,8 +1115,8 @@ void ScXMLExport::WriteRowContent() #endif sal_Int32 nCols(0); sal_Int32 nPrevValidationIndex(-1); - sal_Bool bIsAutoStyle(sal_True); - sal_Bool bIsFirst(sal_True); + bool bIsAutoStyle(true); + bool bIsFirst(true); while (pRowFormatRanges->GetNext(aRange)) { #if OSL_DEBUG_LEVEL > 0 @@ -1151,7 +1151,7 @@ void ScXMLExport::WriteRowContent() GetMM100UnitConverter().convertNumber(aBuf, nCols); AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } - SvXMLElementExport aElemC(*this, sElemCell, sal_True, sal_True); + SvXMLElementExport aElemC(*this, sElemCell, true, true); nIndex = aRange.nIndex; bIsAutoStyle = aRange.bIsAutoStyle; nCols = aRange.nRepeatColumns; @@ -1175,7 +1175,7 @@ void ScXMLExport::WriteRowContent() GetMM100UnitConverter().convertNumber(aBuf, nCols); AddAttribute(sAttrColumnsRepeated, aBuf.makeStringAndClear()); } - SvXMLElementExport aElemC(*this, sElemCell, sal_True, sal_True); + SvXMLElementExport aElemC(*this, sElemCell, true, true); } } @@ -1210,18 +1210,18 @@ void ScXMLExport::WriteRowStartTag( AddAttribute(XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, *pCellStyles->GetStyleNameByIndex(nCellStyleIndex, (*pDefaults->GetRowDefaults())[nRow].bIsAutoStyle)); - StartElement( sElemRow, sal_True); + StartElement( sElemRow, true); } void ScXMLExport::OpenHeaderRows() { - StartElement( XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, sal_True); - bRowHeaderOpen = sal_True; + StartElement( XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, true); + bRowHeaderOpen = true; } void ScXMLExport::CloseHeaderRows() { - EndElement(XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, sal_True); + EndElement(XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, true); } void ScXMLExport::OpenNewRow( @@ -1344,7 +1344,7 @@ void ScXMLExport::CloseRow(const sal_Int32 nRow) { if (nOpenRow > -1) { - EndElement(sElemRow, sal_True); + EndElement(sElemRow, true); if (bHasRowHeader && nRow == aRowHeaderRange.EndRow) { CloseHeaderRows(); @@ -1443,8 +1443,8 @@ void ScXMLExport::ExportFormatRanges(const sal_Int32 nStartCol, const sal_Int32 } } -void ScXMLExport::GetColumnRowHeader(sal_Bool& rHasColumnHeader, table::CellRangeAddress& rColumnHeaderRange, - sal_Bool& rHasRowHeader, table::CellRangeAddress& rRowHeaderRange, +void ScXMLExport::GetColumnRowHeader(bool& rHasColumnHeader, table::CellRangeAddress& rColumnHeaderRange, + bool& rHasRowHeader, table::CellRangeAddress& rRowHeaderRange, rtl::OUString& rPrintRanges) const { uno::Reference <sheet::XPrintAreas> xPrintAreas (xCurrentTable, uno::UNO_QUERY); @@ -1737,7 +1737,7 @@ void ScXMLExport::_ExportContent() WriteConsolidation(); ScXMLExportDDELinks aExportDDELinks(*this); aExportDDELinks.WriteDDELinks(xSpreadDoc); - IncrementProgressBar(sal_True, 0); + IncrementProgressBar(true, 0); GetProgressBarHelper()->SetValue(GetProgressBarHelper()->GetReference()); } @@ -1884,7 +1884,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x else { rtl::OUString sName; - sal_Bool bIsAutoStyle(sal_True); + bool bIsAutoStyle(true); if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates)) { rtl::OUString* pTemp(new rtl::OUString(sName)); @@ -1896,7 +1896,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x uno::Sequence<table::CellRangeAddress> aAddresses(xCellRanges->getRangeAddresses()); table::CellRangeAddress* pAddresses(aAddresses.getArray()); - sal_Bool bGetMerge(sal_True); + bool bGetMerge(true); for (sal_Int32 i = 0; i < aAddresses.getLength(); ++i, ++pAddresses) { pSharedData->SetLastColumn(nTable, pAddresses->EndColumn); @@ -1920,7 +1920,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x { uno::Sequence<table::CellRangeAddress> aAddresses(xCellRanges->getRangeAddresses()); table::CellRangeAddress* pAddresses(aAddresses.getArray()); - sal_Bool bGetMerge(sal_True); + bool bGetMerge(true); for (sal_Int32 i = 0; i < aAddresses.getLength(); ++i, ++pAddresses) { if (bGetMerge) @@ -1938,7 +1938,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x } void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& xColumnProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex, sal_Bool& rIsVisible) + const rtl::OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible) { rtl::OUString SC_SCOLUMNPREFIX(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)); @@ -2107,7 +2107,7 @@ void ScXMLExport::_ExportAutoStyles() Reference<beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex( aPos.Col() ), uno::UNO_QUERY); sal_Int32 nIndex(-1); - sal_Bool bIsVisible(sal_True); + bool bIsVisible(true); AddStyleFromColumn( xColumnProperties, &aColumnIter->maName, nIndex, bIsVisible ); } ++aColumnIter; @@ -2399,7 +2399,7 @@ void ScXMLExport::_ExportAutoStyles() while (nColumn <= MAXCOL) { sal_Int32 nIndex(-1); - sal_Bool bIsVisible(sal_True); + bool bIsVisible(true); Reference <beans::XPropertySet> xColumnProperties(xTableColumns->getByIndex(nColumn), uno::UNO_QUERY); if (xColumnProperties.is()) { @@ -2413,7 +2413,7 @@ void ScXMLExport::_ExportAutoStyles() } if (aCellAddress.EndColumn > nColumns) { - sal_Bool bIsVisible(sal_True); + bool bIsVisible(true); sal_Int32 nIndex(pColumnStyles->GetStyleNameIndex(nTable, nColumns, bIsVisible)); for (sal_Int32 i = nColumns + 1; i <= aCellAddress.EndColumn; ++i) pColumnStyles->AddFieldStyleName(nTable, i, nIndex, bIsVisible); @@ -2511,16 +2511,16 @@ void ScXMLExport::_ExportAutoStyles() // Special table style for the external ref cache tables. AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, sExternalRefTabStyleName); AddAttribute(XML_NAMESPACE_STYLE, XML_FAMILY, XML_TABLE); - SvXMLElementExport aElemStyle(*this, XML_NAMESPACE_STYLE, XML_STYLE, sal_True, sal_True); + SvXMLElementExport aElemStyle(*this, XML_NAMESPACE_STYLE, XML_STYLE, true, true); AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, XML_FALSE); - SvXMLElementExport aElemStyleTabProps(*this, XML_NAMESPACE_STYLE, XML_TABLE_PROPERTIES, sal_True, sal_True); + SvXMLElementExport aElemStyleTabProps(*this, XML_NAMESPACE_STYLE, XML_TABLE_PROPERTIES, true, true); } } } if (getExportFlags() & EXPORT_MASTERSTYLES) { - GetPageExport()->collectAutoStyles(sal_True); + GetPageExport()->collectAutoStyles(true); GetPageExport()->exportAutoStyles(); } @@ -2532,7 +2532,7 @@ void ScXMLExport::_ExportAutoStyles() void ScXMLExport::_ExportMasterStyles() { - GetPageExport()->exportMasterStyles( sal_True ); + GetPageExport()->exportMasterStyles( true ); } void ScXMLExport::CollectInternalShape( uno::Reference< drawing::XShape > xShape ) @@ -2559,7 +2559,7 @@ void ScXMLExport::CollectInternalShape( uno::Reference< drawing::XShape > xShape ScDetectiveFunc aDetFunc( pDoc, static_cast<SCTAB>(nCurrentTable) ); ScAddress aPosition; ScRange aSourceRange; - sal_Bool bRedLine; + bool bRedLine; ScDetectiveObjType eObjType = aDetFunc.GetDetectiveObjectType( pObject, nCurrentTable, aPosition, aSourceRange, bRedLine ); pSharedData->GetDetectiveObjContainer()->AddObject( eObjType, static_cast<SCTAB>(nCurrentTable), aPosition, aSourceRange, bRedLine ); @@ -2568,15 +2568,15 @@ void ScXMLExport::CollectInternalShape( uno::Reference< drawing::XShape > xShape } } -sal_Bool ScXMLExport::GetMerged (const table::CellRangeAddress* pCellAddress, +bool ScXMLExport::GetMerged (const table::CellRangeAddress* pCellAddress, const uno::Reference <sheet::XSpreadsheet>& xTable) { - sal_Bool bReady(false); + bool bReady(false); sal_Int32 nRow(pCellAddress->StartRow); sal_Int32 nCol(pCellAddress->StartColumn); sal_Int32 nEndRow(pCellAddress->EndRow); sal_Int32 nEndCol(pCellAddress->EndColumn); - sal_Bool bRowInc(nEndRow > nRow); + bool bRowInc(nEndRow > nRow); while(!bReady && nRow <= nEndRow && nCol <= nEndCol) { uno::Reference<sheet::XSheetCellRange> xSheetCellRange(xTable->getCellRangeByPosition(nCol, nRow, nCol, nRow), uno::UNO_QUERY); @@ -2598,7 +2598,7 @@ sal_Bool ScXMLExport::GetMerged (const table::CellRangeAddress* pCellAddress, pSharedData->SetLastRow(aCellAddress2.Sheet, aCellAddress2.EndRow); } else - bReady = sal_True; + bReady = true; } } if (!bReady) @@ -2613,8 +2613,8 @@ sal_Bool ScXMLExport::GetMerged (const table::CellRangeAddress* pCellAddress, return !bReady; } -sal_Bool ScXMLExport::IsMatrix (const ScAddress& aCell, - table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const +bool ScXMLExport::IsMatrix (const ScAddress& aCell, + table::CellRangeAddress& aCellAddress, bool& bIsFirst) const { bIsFirst = false; @@ -2626,31 +2626,31 @@ sal_Bool ScXMLExport::IsMatrix (const ScAddress& aCell, if ((aCellAddress.StartColumn == aCell.Col() && aCellAddress.StartRow == aCell.Row()) && (aCellAddress.EndColumn > aCell.Col() || aCellAddress.EndRow > aCell.Row())) { - bIsFirst = sal_True; - return sal_True; + bIsFirst = true; + return true; } else if (aCellAddress.StartColumn != aCell.Col() || aCellAddress.StartRow != aCell.Row() || aCellAddress.EndColumn != aCell.Col() || aCellAddress.EndRow != aCell.Row()) - return sal_True; + return true; else { - bIsFirst = sal_True; - return sal_True; + bIsFirst = true; + return true; } } return false; } -sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) const +bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) const { if (rMyCell.bHasStringValue) - return sal_True; + return true; else { rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos); - rMyCell.bHasStringValue = sal_True; - return sal_True; + rMyCell.bHasStringValue = true; + return true; } } @@ -2716,13 +2716,13 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe } rtl::OUString sPrintRanges; table::CellRangeAddress aColumnHeaderRange; - sal_Bool bHasColumnHeader; + bool bHasColumnHeader; GetColumnRowHeader(bHasColumnHeader, aColumnHeaderRange, bHasRowHeader, aRowHeaderRange, sPrintRanges); if( sPrintRanges.getLength() ) AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT_RANGES, sPrintRanges ); else if (!pDoc->IsPrintEntireSheet(static_cast<SCTAB>(nTable))) AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT, XML_FALSE); - SvXMLElementExport aElemT(*this, sElemTab, sal_True, sal_True); + SvXMLElementExport aElemT(*this, sElemTab, true, true); if (pProtect && pProtect->isProtected()) { @@ -2755,7 +2755,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe { ::xmloff::OOfficeFormsExport aForms(*this); GetFormExport()->exportForms( xDrawPage ); - sal_Bool bRet(GetFormExport()->seekPage( xDrawPage )); + bool bRet(GetFormExport()->seekPage( xDrawPage )); OSL_ENSURE( bRet, "OFormLayerXMLExport::seekPage failed!" ); (void)bRet; // avoid warning in product version } @@ -2783,7 +2783,7 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe pCellStyles->SetRowDefaults(pDefaults->GetRowDefaults()); pCellStyles->SetColDefaults(pDefaults->GetColDefaults()); ExportColumns(nTable, aColumnHeaderRange, bHasColumnHeader); - sal_Bool bIsFirst(sal_True); + bool bIsFirst(true); sal_Int32 nEqualCells(0); ScMyCell aCell; ScMyCell aPrevCell; @@ -2854,8 +2854,8 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) AddAttribute(sAttrStyleName, *pCellStyles->GetStyleNameByIndex(aCell.nStyleIndex, aCell.bIsAutoStyle)); if (aCell.nValidationIndex > -1) AddAttribute(XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME, pValidationsContainer->GetValidationName(aCell.nValidationIndex)); - sal_Bool bIsMatrix(aCell.bIsMatrixBase || aCell.bIsMatrixCovered); - sal_Bool bIsFirstMatrixCell(aCell.bIsMatrixBase); + bool bIsMatrix(aCell.bIsMatrixBase || aCell.bIsMatrixCovered); + bool bIsFirstMatrixCell(aCell.bIsMatrixBase); if (bIsFirstMatrixCell) { sal_Int32 nColumns(aCell.aMatrixRange.EndColumn - aCell.aMatrixRange.StartColumn + 1); @@ -2867,12 +2867,12 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_COLUMNS_SPANNED, sColumns.makeStringAndClear()); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_ROWS_SPANNED, sRows.makeStringAndClear()); } - sal_Bool bIsEmpty(false); + bool bIsEmpty(false); switch (aCell.nType) { case table::CellContentType_EMPTY : { - bIsEmpty = sal_True; + bIsEmpty = true; } break; case table::CellContentType_VALUE : @@ -2880,7 +2880,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) if (!aCell.bHasDoubleValue) { aCell.fValue = pDoc->GetValue( aCellPos ); - aCell.bHasDoubleValue = sal_True; + aCell.bHasDoubleValue = true; } GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( aCell.nNumberFormat, aCell.fValue); @@ -2892,7 +2892,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) { rtl::OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( - sFormula, aCell.sStringValue, sal_True, sal_True); + sFormula, aCell.sStringValue, true, true); } } break; @@ -2920,7 +2920,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) } if (pFormulaCell->IsValue()) { - sal_Bool bIsStandard; + bool bIsStandard; rtl::OUString sCurrency; GetNumberFormatAttributesExportHelper()->GetCellType(aCell.nNumberFormat, sCurrency, bIsStandard); if (bIsStandard) @@ -2973,28 +2973,28 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED, sRows.makeStringAndClear()); } } - SvXMLElementExport aElemC(*this, *pCellString, sal_True, sal_True); + SvXMLElementExport aElemC(*this, *pCellString, true, true); CheckAttrList(); WriteAreaLink(aCell); WriteAnnotation(aCell); WriteDetective(aCell); - sal_Bool bEditCell = false; + bool bEditCell = false; if (!bIsEmpty) { if ((aCell.nType == table::CellContentType_TEXT && IsEditCell(aCell)) || (aCell.nType == table::CellContentType_FORMULA && IsMultiLineFormulaCell(aCell))) { - bEditCell = sal_True; + bEditCell = true; uno::Reference<text::XText> xText(xCurrentTableCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row), uno::UNO_QUERY); if ( xText.is()) GetTextParagraphExport()->exportText(xText, false, false); } else { - SvXMLElementExport aElemP(*this, sElemP, sal_True, false); - sal_Bool bPrevCharWasSpace(sal_True); + SvXMLElementExport aElemP(*this, sElemP, true, false); + bool bPrevCharWasSpace(true); if (GetCellText(aCell, aCellPos)) GetTextParagraphExport()->exportText(aCell.sStringValue, bPrevCharWasSpace); } @@ -3137,7 +3137,7 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell) awt::Point aPoint; Rectangle aRec = pDoc->GetMMRect(static_cast<SCCOL>(rMyCell.aCellAddress.Column), static_cast<SCROW>(rMyCell.aCellAddress.Row), static_cast<SCCOL>(rMyCell.aCellAddress.Column), static_cast<SCROW>(rMyCell.aCellAddress.Row), static_cast<SCTAB>(rMyCell.aCellAddress.Sheet)); - sal_Bool bNegativePage(pDoc->IsNegativePage(rMyCell.aCellAddress.Sheet)); + bool bNegativePage(pDoc->IsNegativePage(rMyCell.aCellAddress.Sheet)); if (bNegativePage) aPoint.X = aRec.Right(); else @@ -3177,7 +3177,7 @@ void ScXMLExport::WriteTableShapes() if (pTableShapes && !(*pTableShapes)[nCurrentTable].empty()) { OSL_ENSURE(pTableShapes->size() > static_cast<size_t>(nCurrentTable), "wrong Table"); - SvXMLElementExport aShapesElem(*this, XML_NAMESPACE_TABLE, XML_SHAPES, sal_True, false); + SvXMLElementExport aShapesElem(*this, XML_NAMESPACE_TABLE, XML_SHAPES, true, false); ScMyTableXShapes::iterator aItr((*pTableShapes)[nCurrentTable].begin()); ScMyTableXShapes::iterator aEndItr((*pTableShapes)[nCurrentTable].end()); while (aItr != aEndItr) @@ -3221,7 +3221,7 @@ void ScXMLExport::WriteAreaLink( const ScMyCell& rMyCell ) SvXMLUnitConverter::convertTime( sValue, (double)rAreaLink.nRefresh / 86400 ); AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sValue.makeStringAndClear() ); } - SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, sal_True, sal_True ); + SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, true, true ); } } @@ -3233,7 +3233,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > if (sAuthor.getLength()) { SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, - XML_CREATOR, sal_True, + XML_CREATOR, true, false ); Characters(sAuthor); } @@ -3247,16 +3247,16 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > if (pNumForm->IsNumberFormat(aDate, nfIndex, fDate)) { rtl::OUStringBuffer sBuf; - GetMM100UnitConverter().convertDateTime(sBuf, fDate,sal_True); + GetMM100UnitConverter().convertDateTime(sBuf, fDate,true); SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, - XML_DATE, sal_True, + XML_DATE, true, false ); Characters(sBuf.makeStringAndClear()); } else { SvXMLElementExport aDateElem( *this, XML_NAMESPACE_META, - XML_DATE_STRING, sal_True, + XML_DATE_STRING, true, false ); Characters(rtl::OUString(aDate)); } @@ -3264,7 +3264,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape > else { SvXMLElementExport aDateElem( *this, XML_NAMESPACE_META, - XML_DATE_STRING, sal_True, + XML_DATE_STRING, true, false ); Characters(rtl::OUString(aDate)); } @@ -3300,7 +3300,7 @@ void ScXMLExport::WriteDetective( const ScMyCell& rMyCell ) sal_Int32 nOpCount(rOpVec.size()); if( nObjCount || nOpCount ) { - SvXMLElementExport aDetElem( *this, XML_NAMESPACE_TABLE, XML_DETECTIVE, sal_True, sal_True ); + SvXMLElementExport aDetElem( *this, XML_NAMESPACE_TABLE, XML_DETECTIVE, true, true ); OUString sString; ScMyDetectiveObjVec::const_iterator aObjItr(rObjVec.begin()); ScMyDetectiveObjVec::const_iterator aEndObjItr(rObjVec.end()); @@ -3320,7 +3320,7 @@ void ScXMLExport::WriteDetective( const ScMyCell& rMyCell ) } else AddAttribute( XML_NAMESPACE_TABLE, XML_MARKED_INVALID, XML_TRUE ); - SvXMLElementExport aRangeElem( *this, XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, sal_True, sal_True ); + SvXMLElementExport aRangeElem( *this, XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, true, true ); ++aObjItr; } OUStringBuffer aBuffer; @@ -3333,7 +3333,7 @@ void ScXMLExport::WriteDetective( const ScMyCell& rMyCell ) AddAttribute( XML_NAMESPACE_TABLE, XML_NAME, sOpString ); SvXMLUnitConverter::convertNumber( aBuffer, aOpItr->nIndex ); AddAttribute( XML_NAMESPACE_TABLE, XML_INDEX, aBuffer.makeStringAndClear() ); - SvXMLElementExport aRangeElem( *this, XML_NAMESPACE_TABLE, XML_OPERATION, sal_True, sal_True ); + SvXMLElementExport aRangeElem( *this, XML_NAMESPACE_TABLE, XML_OPERATION, true, true ); ++aOpItr; } } @@ -3351,12 +3351,12 @@ void ScXMLExport::SetRepeatAttribute (const sal_Int32 nEqualCellCount) } } -sal_Bool ScXMLExport::IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const +bool ScXMLExport::IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const { return (aCell1.nType == aCell2.nType); } -sal_Bool ScXMLExport::IsEditCell(const com::sun::star::table::CellAddress& aAddress, ScMyCell* pMyCell) const +bool ScXMLExport::IsEditCell(const com::sun::star::table::CellAddress& aAddress, ScMyCell* pMyCell) const { ScAddress aCoreAddress(static_cast<SCCOL>(aAddress.Column), static_cast<SCROW>(aAddress.Row), @@ -3370,19 +3370,19 @@ sal_Bool ScXMLExport::IsEditCell(const com::sun::star::table::CellAddress& aAddr return false; } -sal_Bool ScXMLExport::IsEditCell(ScMyCell& rCell) const +bool ScXMLExport::IsEditCell(ScMyCell& rCell) const { if (rCell.bKnowWhetherIsEditCell) return rCell.bIsEditCell; else { rCell.bIsEditCell = IsEditCell(rCell.aCellAddress, &rCell); - rCell.bKnowWhetherIsEditCell = sal_True; + rCell.bKnowWhetherIsEditCell = true; return rCell.bIsEditCell; } } -sal_Bool ScXMLExport::IsMultiLineFormulaCell(ScMyCell& rCell) const +bool ScXMLExport::IsMultiLineFormulaCell(ScMyCell& rCell) const { if (rCell.pBaseCell) { @@ -3406,13 +3406,13 @@ sal_Bool ScXMLExport::IsMultiLineFormulaCell(ScMyCell& rCell) const return static_cast<ScFormulaCell*>(rCell.pBaseCell)->IsMultilineResult(); } -sal_Bool ScXMLExport::IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2) +bool ScXMLExport::IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2) { ScAddress aCellPos1; ScUnoConversion::FillScAddress( aCellPos1, aCell1.aCellAddress ); ScAddress aCellPos2; ScUnoConversion::FillScAddress( aCellPos2, aCell2.aCellAddress ); - sal_Bool bIsEqual = false; + bool bIsEqual = false; if( !aCell1.bIsMergedBase && !aCell2.bIsMergedBase && aCell1.bIsCovered == aCell2.bIsCovered && !aCell1.bIsMatrixBase && !aCell2.bIsMatrixBase && @@ -3439,7 +3439,7 @@ sal_Bool ScXMLExport::IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2) { case table::CellContentType_EMPTY : { - bIsEqual = sal_True; + bIsEqual = true; } break; case table::CellContentType_VALUE : @@ -3447,12 +3447,12 @@ sal_Bool ScXMLExport::IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2) if(!aCell1.bHasDoubleValue) { aCell1.fValue = pDoc->GetValue( aCellPos1 ); - aCell1.bHasDoubleValue = sal_True; + aCell1.bHasDoubleValue = true; } if (!aCell2.bHasDoubleValue) { aCell2.fValue = pDoc->GetValue( aCellPos2 ); - aCell2.bHasDoubleValue = sal_True; + aCell2.bHasDoubleValue = true; } // #i29101# number format may be different from column default styles, // but can lead to different value types, so it must also be compared @@ -3499,12 +3499,12 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads uno::Reference<beans::XPropertySet> xPropertySet(xSpreadDoc, uno::UNO_QUERY); if (xPropertySet.is()) { - sal_Bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); - sal_Bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); - sal_Bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); - sal_Bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); - sal_Bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); - sal_Bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); + bool bCalcAsShown (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_CALCASSHOWN))) )); + bool bIgnoreCase (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_IGNORECASE))) )); + bool bLookUpLabels (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_LOOKUPLABELS))) )); + bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_MATCHWHOLE))) )); + bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_REGEXENABLED))) )); + bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERENABLED))) )); sal_uInt16 nYear2000 (pDoc ? pDoc->GetDocOptions().GetYear2000() : 0); sal_Int32 nIterationCount(100); xPropertySet->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITERCOUNT))) >>= nIterationCount; @@ -3532,14 +3532,14 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads GetMM100UnitConverter().convertNumber(sBuffer, nYear2000); AddAttribute(XML_NAMESPACE_TABLE, XML_NULL_YEAR, sBuffer.makeStringAndClear()); } - SvXMLElementExport aCalcSettings(*this, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, sal_True, sal_True); + SvXMLElementExport aCalcSettings(*this, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, true, true); { if (aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899) { rtl::OUStringBuffer sDate; GetMM100UnitConverter().convertDateTime(sDate, 0.0, aNullDate); AddAttribute(XML_NAMESPACE_TABLE, XML_DATE_VALUE, sDate.makeStringAndClear()); - SvXMLElementExport aElemNullDate(*this, XML_NAMESPACE_TABLE, XML_NULL_DATE, sal_True, sal_True); + SvXMLElementExport aElemNullDate(*this, XML_NAMESPACE_TABLE, XML_NULL_DATE, true, true); } if (bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001)) { @@ -3556,7 +3556,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads GetMM100UnitConverter().convertDouble(sBuffer, fIterationEpsilon); AddAttribute(XML_NAMESPACE_TABLE, XML_MAXIMUM_DIFFERENCE, sBuffer.makeStringAndClear()); } - SvXMLElementExport aElemIteration(*this, XML_NAMESPACE_TABLE, XML_ITERATION, sal_True, sal_True); + SvXMLElementExport aElemIteration(*this, XML_NAMESPACE_TABLE, XML_ITERATION, true, true); } } } @@ -3581,7 +3581,7 @@ void ScXMLExport::WriteTableSource() sal_Int32 nCount(xIndex->getCount()); if (nCount) { - sal_Bool bFound(false); + bool bFound(false); uno::Reference <beans::XPropertySet> xLinkProps; for (sal_Int32 i = 0; (i < nCount) && !bFound; ++i) { @@ -3620,7 +3620,7 @@ void ScXMLExport::WriteTableSource() SvXMLUnitConverter::convertTime( sBuffer, (double)nRefresh / 86400 ); AddAttribute( XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, sBuffer.makeStringAndClear() ); } - SvXMLElementExport aSourceElem(*this, XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, sal_True, sal_True); + SvXMLElementExport aSourceElem(*this, XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, true, true); } } } @@ -3680,13 +3680,13 @@ void ScXMLExport::WriteTheLabelRanges( const uno::Reference< sheet::XSpreadsheet if( nCount ) { - SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_LABEL_RANGES, sal_True, sal_True ); - WriteLabelRanges( xColRangesIAccess, sal_True ); + SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_LABEL_RANGES, true, true ); + WriteLabelRanges( xColRangesIAccess, true ); WriteLabelRanges( xRowRangesIAccess, false ); } } -void ScXMLExport::WriteLabelRanges( const uno::Reference< container::XIndexAccess >& xRangesIAccess, sal_Bool bColumn ) +void ScXMLExport::WriteLabelRanges( const uno::Reference< container::XIndexAccess >& xRangesIAccess, bool bColumn ) { if( !xRangesIAccess.is() ) return; @@ -3704,7 +3704,7 @@ void ScXMLExport::WriteLabelRanges( const uno::Reference< container::XIndexAcces ScRangeStringConverter::GetStringFromRange( sRangeStr, aCellRange, pDoc, FormulaGrammar::CONV_OOO ); AddAttribute( XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, sRangeStr ); AddAttribute( XML_NAMESPACE_TABLE, XML_ORIENTATION, bColumn ? XML_COLUMN : XML_ROW ); - SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_LABEL_RANGE, sal_True, sal_True ); + SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_LABEL_RANGE, true, true ); } } } @@ -3720,7 +3720,7 @@ void ScXMLExport::WriteNamedExpressions() void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) { //write a global or local ScRangeName - SvXMLElementExport aElemNEs(*this, XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, sal_True, sal_True); + SvXMLElementExport aElemNEs(*this, XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, true, true); for (ScRangeName::iterator it = pRangeName->begin(); it != pRangeName->end(); ++it) { AddAttribute(sAttrName, it->GetName()); @@ -3765,13 +3765,13 @@ void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName) rtl::OUString sRangeType = sBufferRangeType.makeStringAndClear(); if (sRangeType.getLength()) AddAttribute(XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, sRangeType); - SvXMLElementExport aElemNR(*this, XML_NAMESPACE_TABLE, XML_NAMED_RANGE, sal_True, sal_True); + SvXMLElementExport aElemNR(*this, XML_NAMESPACE_TABLE, XML_NAMED_RANGE, true, true); } else { AddAttribute(XML_NAMESPACE_TABLE, XML_EXPRESSION, sTempSymbol); - SvXMLElementExport aElemNE(*this, XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, sal_True, sal_True); + SvXMLElementExport aElemNE(*this, XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, true, true); } } } @@ -3811,7 +3811,7 @@ void ScXMLExport::WriteExternalRefCaches() AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, aBuf.makeStringAndClear()); AddAttribute(XML_NAMESPACE_TABLE, XML_PRINT, GetXMLToken(XML_FALSE)); AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, sExternalRefTabStyleName); - SvXMLElementExport aElemTable(*this, XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True); + SvXMLElementExport aElemTable(*this, XML_NAMESPACE_TABLE, XML_TABLE, true, true); { const ScExternalRefManager::SrcFileData* pExtFileData = pRefMgr->getExternalFileData(nFileId); if (pExtFileData) @@ -3830,7 +3830,7 @@ void ScXMLExport::WriteExternalRefCaches() AddAttribute(XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS, pExtFileData->maFilterOptions); AddAttribute(XML_NAMESPACE_TABLE, XML_MODE, XML_COPY_RESULTS_ONLY); } - SvXMLElementExport aElemTableSource(*this, XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, sal_True, sal_True); + SvXMLElementExport aElemTableSource(*this, XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, true, true); } // Determine maximum column count of used area, for repeated cells. @@ -3856,7 +3856,7 @@ void ScXMLExport::WriteExternalRefCaches() if (nMaxColsUsed > 1) AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, OUString::valueOf(static_cast<sal_Int32>(nMaxColsUsed))); - SvXMLElementExport aElemColumn(*this, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True); + SvXMLElementExport aElemColumn(*this, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true); } // Write cache content for this table. @@ -3876,11 +3876,11 @@ void ScXMLExport::WriteExternalRefCaches() aVal.append(nRow); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, aVal.makeStringAndClear()); } - SvXMLElementExport aElemRow(*this, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True); + SvXMLElementExport aElemRow(*this, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true); OUStringBuffer aVal; aVal.append(static_cast<sal_Int32>(nMaxColsUsed)); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, aVal.makeStringAndClear()); - SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true); } } else @@ -3894,14 +3894,14 @@ void ScXMLExport::WriteExternalRefCaches() aVal.append(static_cast<sal_Int32>(nRowGap-1)); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, aVal.makeStringAndClear()); } - SvXMLElementExport aElemRow(*this, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True); + SvXMLElementExport aElemRow(*this, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true); OUStringBuffer aVal; aVal.append(static_cast<sal_Int32>(nMaxColsUsed)); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, aVal.makeStringAndClear()); - SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true); } } - SvXMLElementExport aElemRow(*this, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True); + SvXMLElementExport aElemRow(*this, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true); vector<SCCOL> aCols; pTable->getAllCols(nRow, aCols); @@ -3921,7 +3921,7 @@ void ScXMLExport::WriteExternalRefCaches() aVal.append(static_cast<sal_Int32>(nCol)); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, aVal.makeStringAndClear()); } - SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true); } } else @@ -3935,7 +3935,7 @@ void ScXMLExport::WriteExternalRefCaches() aVal.append(static_cast<sal_Int32>(nColGap-1)); AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, aVal.makeStringAndClear()); } - SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true); } } @@ -3973,8 +3973,8 @@ void ScXMLExport::WriteExternalRefCaches() ; } } - SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); - SvXMLElementExport aElemText(*this, XML_NAMESPACE_TEXT, XML_P, sal_True, false); + SvXMLElementExport aElemCell(*this, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true); + SvXMLElementExport aElemText(*this, XML_NAMESPACE_TEXT, XML_P, true, false); Characters(aStrVal); nLastCol = nCol; @@ -4002,7 +4002,7 @@ void ScXMLExport::WriteConsolidation() sStrData = OUString(); for( sal_Int32 nIndex = 0; nIndex < pCons->nDataAreaCount; ++nIndex ) - ScRangeStringConverter::GetStringFromArea( sStrData, *pCons->ppDataAreas[ nIndex ], pDoc, FormulaGrammar::CONV_OOO, sal_True ); + ScRangeStringConverter::GetStringFromArea( sStrData, *pCons->ppDataAreas[ nIndex ], pDoc, FormulaGrammar::CONV_OOO, true ); AddAttribute( XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, sStrData ); ScRangeStringConverter::GetStringFromAddress( sStrData, ScAddress( pCons->nCol, pCons->nRow, pCons->nTab ), pDoc, FormulaGrammar::CONV_OOO ); @@ -4018,7 +4018,7 @@ void ScXMLExport::WriteConsolidation() if( pCons->bReferenceData ) AddAttribute( XML_NAMESPACE_TABLE, XML_LINK_TO_SOURCE_DATA, XML_TRUE ); - SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_CONSOLIDATION, sal_True, sal_True ); + SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_CONSOLIDATION, true, true ); } } } @@ -4237,7 +4237,7 @@ void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uIn XML_NAMESPACE_PRESENTATION ); } -void ScXMLExport::IncrementProgressBar(sal_Bool bEditCell, sal_Int32 nInc) +void ScXMLExport::IncrementProgressBar(bool bEditCell, sal_Int32 nInc) { nProgressCount += nInc; if (bEditCell || nProgressCount > 100) @@ -4321,8 +4321,8 @@ sal_Bool SAL_CALL ScXMLExport::filter( const ::com::sun::star::uno::Sequence< :: { SolarMutexGuard aGuard; if (pDoc) - pDoc->DisableIdle(sal_True); - sal_Bool bReturn(SvXMLExport::filter(aDescriptor)); + pDoc->DisableIdle(true); + bool bReturn(SvXMLExport::filter(aDescriptor)); if (pDoc) pDoc->DisableIdle(false); return bReturn; diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 3cefa474664e..b7142a4d0309 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -126,12 +126,12 @@ class ScXMLExport : public SvXMLExport sal_Int32 nOpenRow; sal_Int32 nProgressCount; sal_uInt16 nCurrentTable; - sal_Bool bHasRowHeader; - sal_Bool bRowHeaderOpen; - sal_Bool mbShowProgress; + bool bHasRowHeader; + bool bRowHeaderOpen; + bool mbShowProgress; sal_Int32 GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const; - sal_Bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc); + bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc); void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount); void CollectShapesAutoStyles(const sal_Int32 nTableCount); void WriteTablesView(const com::sun::star::uno::Any& aTableView); @@ -152,12 +152,12 @@ class ScXMLExport : public SvXMLExport void GetAreaLinks( com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc, ScMyAreaLinksContainer& rAreaLinks ); void GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp ); void WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_Int32 nStyleIndex, - const sal_Int32 nIndex, const sal_Bool bIsAutoStyle, const sal_Bool bIsVisible); + const sal_Int32 nIndex, const bool bIsAutoStyle, const bool bIsVisible); void WriteColumn(const sal_Int32 nColumn, const sal_Int32 nRepeatColumns, - const sal_Int32 nStyleIndex, const sal_Bool bIsVisible); + const sal_Int32 nStyleIndex, const bool bIsVisible); void OpenHeaderColumn(); void CloseHeaderColumn(); - void ExportColumns(const sal_Int32 nTable, const com::sun::star::table::CellRangeAddress& aColumnHeaderRange, const sal_Bool bHasColumnHeader); + void ExportColumns(const sal_Int32 nTable, const com::sun::star::table::CellRangeAddress& aColumnHeaderRange, const bool bHasColumnHeader); void ExportExternalRefCacheStyles(); void ExportFormatRanges(const sal_Int32 nStartCol, const sal_Int32 nStartRow, const sal_Int32 nEndCol, const sal_Int32 nEndRow, const sal_Int32 nSheet); @@ -171,16 +171,16 @@ class ScXMLExport : public SvXMLExport bool bHidden, bool bFiltered); void OpenRow(const sal_Int32 nTable, const sal_Int32 nStartRow, const sal_Int32 nRepeatRow, ScXMLCachedRowAttrAccess& rRowAttr); void CloseRow(const sal_Int32 nRow); - void GetColumnRowHeader(sal_Bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, - sal_Bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, + void GetColumnRowHeader(bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, + bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, rtl::OUString& rPrintRanges) const; void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); - sal_Bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, + bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet>& xTable); - sal_Bool GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) const; + bool GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) const; void WriteTable(sal_Int32 nTable, const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet>& xTable); void WriteCell (ScMyCell& aCell); @@ -192,17 +192,17 @@ class ScXMLExport : public SvXMLExport void WriteTableShapes(); void SetRepeatAttribute (const sal_Int32 nEqualCellCount); - sal_Bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const; - sal_Bool IsEditCell(const com::sun::star::table::CellAddress& aAddress, ScMyCell* pMyCell = NULL) const; - sal_Bool IsEditCell(ScMyCell& rCell) const; - sal_Bool IsMultiLineFormulaCell(ScMyCell& rCell) const; - sal_Bool IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2); + bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const; + bool IsEditCell(const com::sun::star::table::CellAddress& aAddress, ScMyCell* pMyCell = NULL) const; + bool IsEditCell(ScMyCell& rCell) const; + bool IsMultiLineFormulaCell(ScMyCell& rCell) const; + bool IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2); void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); void WriteTableSource(); void WriteScenario(); // core implementation void WriteTheLabelRanges(const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc); - void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, sal_Bool bColumn ); + void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, bool bColumn ); void WriteNamedExpressions(); void WriteNamedRange(ScRangeName* pRangeName); void WriteExternalRefCaches(); @@ -217,12 +217,12 @@ class ScXMLExport : public SvXMLExport sal_Int32 nTable, const rtl::OUString* pOldName ); void AddStyleFromColumn( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xColumnProperties, - const rtl::OUString* pOldName, sal_Int32& rIndex, sal_Bool& rIsVisible ); + const rtl::OUString* pOldName, sal_Int32& rIndex, bool& rIsVisible ); void AddStyleFromRow( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xRowProperties, const rtl::OUString* pOldName, sal_Int32& rIndex ); - void IncrementProgressBar(sal_Bool bEditCell, sal_Int32 nInc = 1); + void IncrementProgressBar(bool bEditCell, sal_Int32 nInc = 1); void CopySourceStream( sal_Int32 nStartOffset, sal_Int32 nEndOffset, sal_Int32& rNewStart, sal_Int32& rNewEnd ); @@ -242,8 +242,8 @@ public: static sal_Int16 GetFieldUnit(); inline ScDocument* GetDocument() { return pDoc; } inline const ScDocument* GetDocument() const { return pDoc; } - sal_Bool IsMatrix (const ScAddress& aCell, - com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const; + bool IsMatrix (const ScAddress& aCell, + com::sun::star::table::CellRangeAddress& aCellAddress, bool& bIsFirst) const; UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() { return xCellStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() { return xTableStylesPropertySetMapper; } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index d4f82bba649e..c2ca970dcefc 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2404,7 +2404,7 @@ void ScXMLImport::SetType(uno::Reference <beans::XPropertySet>& rProperties, if (rNumberFormat == -1) rProperties->getPropertyValue( sNumberFormat ) >>= rNumberFormat; OSL_ENSURE(rNumberFormat != -1, "no NumberFormat"); - sal_Bool bIsStandard; + bool bIsStandard; // sCurrentCurrency may be the ISO code abbreviation if the currency // symbol matches such, or if no match found the symbol itself! rtl::OUString sCurrentCurrency; diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index e494f6377296..0740d9f4ce59 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -135,7 +135,7 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix case XML_TOK_TABLE_ROW_CELL: // if( IsInsertCellPossible() ) { - bHasCell = sal_True; + bHasCell = true; pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, rLName, xAttrList, false, nRepeatedRows //this @@ -145,9 +145,9 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix case XML_TOK_TABLE_ROW_COVERED_CELL: // if( IsInsertCellPossible() ) { - bHasCell = sal_True; + bHasCell = true; pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, - rLName, xAttrList, sal_True, nRepeatedRows + rLName, xAttrList, true, nRepeatedRows //this ); } @@ -194,7 +194,7 @@ void ScXMLTableRowContext::EndElement() if ( pStyles ) { XMLTableStyleContext* pStyle((XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_ROW, sStyleName, sal_True)); + XML_STYLE_FAMILY_TABLE_ROW, sStyleName, true)); if (pStyle) { pStyle->FillPropertySet(xRowProperties); @@ -208,8 +208,8 @@ void ScXMLTableRowContext::EndElement() } } } - sal_Bool bVisible (sal_True); - sal_Bool bFiltered (false); + bool bVisible (true); + bool bFiltered (false); if (IsXMLToken(sVisibility, XML_COLLAPSE)) { bVisible = false; @@ -217,7 +217,7 @@ void ScXMLTableRowContext::EndElement() else if (IsXMLToken(sVisibility, XML_FILTER)) { bVisible = false; - bFiltered = sal_True; + bFiltered = true; } if (!bVisible) xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); @@ -234,7 +234,7 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const sal_Bool bTempHeader, const sal_Bool bTempGroup ) : + const bool bTempHeader, const bool bTempGroup ) : SvXMLImportContext( rImport, nPrfx, rLName ), nHeaderStartRow(0), nHeaderEndRow(0), @@ -242,7 +242,7 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, nGroupEndRow(0), bHeader(bTempHeader), bGroup(bTempGroup), - bGroupDisplay(sal_True) + bGroupDisplay(true) { // don't have any attributes if (bHeader) @@ -286,12 +286,12 @@ SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefi case XML_TOK_TABLE_ROWS_ROW_GROUP: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, rLName, xAttrList, - false, sal_True ); + false, true ); break; case XML_TOK_TABLE_ROWS_HEADER_ROWS: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, rLName, xAttrList, - sal_True, false ); + true, false ); break; case XML_TOK_TABLE_ROWS_ROWS: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, @@ -325,7 +325,7 @@ void ScXMLTableRowsContext::EndElement() { if (!xPrintAreas->getPrintTitleRows()) { - xPrintAreas->setPrintTitleRows(sal_True); + xPrintAreas->setPrintTitleRows(true); table::CellRangeAddress aRowHeaderRange; aRowHeaderRange.StartRow = nHeaderStartRow; aRowHeaderRange.EndRow = nHeaderEndRow; @@ -350,7 +350,7 @@ void ScXMLTableRowsContext::EndElement() if (pDoc) { ScXMLImport::MutexGuard aGuard(GetScImport()); - ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nSheet, sal_True)); + ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nSheet, true)); ScOutlineArray* pRowArray(pOutlineTable->GetRowArray()); bool bResized; pRowArray->Insert(static_cast<SCROW>(nGroupStartRow), static_cast<SCROW>(nGroupEndRow), bResized, !bGroupDisplay, true); diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index c41644bcf041..c446c17cfb52 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -38,7 +38,7 @@ class ScXMLTableRowContext : public SvXMLImportContext rtl::OUString sStyleName; rtl::OUString sVisibility; sal_Int32 nRepeatedRows; - sal_Bool bHasCell; + bool bHasCell; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -66,9 +66,9 @@ class ScXMLTableRowsContext : public SvXMLImportContext sal_Int32 nHeaderEndRow; sal_Int32 nGroupStartRow; sal_Int32 nGroupEndRow; - sal_Bool bHeader; - sal_Bool bGroup; - sal_Bool bGroupDisplay; + bool bHeader; + bool bGroup; + bool bGroupDisplay; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -79,7 +79,7 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const sal_Bool bHeader, const sal_Bool bGroup); + const bool bHeader, const bool bGroup); virtual ~ScXMLTableRowsContext(); diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index a64efa8e96aa..c40f93692aa2 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -114,7 +114,7 @@ void ScMyTableData::AddColumn() nRealCols[aTableCellPos.Column + 1] = nRealCols[aTableCellPos.Column] + nColsPerCol[aTableCellPos.Column]; } -sal_Int32 ScMyTableData::GetRealCols(const sal_Int32 nIndex, const sal_Bool /* bIsNormal */) const +sal_Int32 ScMyTableData::GetRealCols(const sal_Int32 nIndex, const bool /* bIsNormal */) const { return (nIndex < 0) ? 0 : nRealCols[nIndex]; } @@ -256,7 +256,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& if (pStyles) { XMLTableStyleContext* pStyle = (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, sal_True); + XML_STYLE_FAMILY_TABLE_TABLE, sStyleName, true); if (pStyle) { pStyle->FillPropertySet(xProperties); @@ -277,7 +277,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& NewTable(1); } -sal_Bool ScMyTables::IsMerged (const uno::Reference <table::XCellRange>& xCellRange, const sal_Int32 nCol, const sal_Int32 nRow, +bool ScMyTables::IsMerged (const uno::Reference <table::XCellRange>& xCellRange, const sal_Int32 nCol, const sal_Int32 nRow, table::CellRangeAddress& aCellAddress) const { uno::Reference <util::XMergeable> xMergeable (xCellRange->getCellRangeByPosition(nCol,nRow,nCol,nRow), uno::UNO_QUERY); @@ -297,7 +297,7 @@ sal_Bool ScMyTables::IsMerged (const uno::Reference <table::XCellRange>& xCellRa aCellAddress.StartRow == nRow && aCellAddress.EndRow == nRow) return false; else - return sal_True; + return true; } } } @@ -354,7 +354,7 @@ void ScMyTables::DoMerge(sal_Int32 nCount) uno::Reference <util::XMergeable> xMergeable (xMergeCellRange, uno::UNO_QUERY); if (xMergeable.is()) - xMergeable->merge(sal_True); + xMergeable->merge(true); } } @@ -379,7 +379,7 @@ void ScMyTables::InsertRow() uno::Reference <util::XMergeable> xMergeable (xCurrentCellRange->getCellRangeByPosition(aCellAddress.StartColumn, aCellAddress.StartRow, aCellAddress.EndColumn, aCellAddress.EndRow + 1), uno::UNO_QUERY); if (xMergeable.is()) - xMergeable->merge(sal_True); + xMergeable->merge(true); j += aCellAddress.EndColumn - aCellAddress.StartColumn; } rImport.GetStylesImportHelper()->InsertRow(nRow, nCurrentSheet, rImport.GetDocument()); @@ -466,14 +466,14 @@ void ScMyTables::InsertColumn() uno::Reference <util::XMergeable> xMergeable (xCurrentCellRange->getCellRangeByPosition(aCellAddress.StartColumn, aCellAddress.StartRow, aCellAddress.EndColumn + 1, aCellAddress.EndRow), uno::UNO_QUERY); if (xMergeable.is()) - xMergeable->merge(sal_True); + xMergeable->merge(true); j += aCellAddress.EndRow - aCellAddress.StartRow; } rImport.GetStylesImportHelper()->InsertCol(nCol, nCurrentSheet, rImport.GetDocument()); } } -void ScMyTables::NewColumn(sal_Bool bIsCovered) +void ScMyTables::NewColumn(bool bIsCovered) { if (bIsCovered) return; @@ -524,7 +524,7 @@ void ScMyTables::NewColumn(sal_Bool bIsCovered) } } -void ScMyTables::AddColumn(sal_Bool bIsCovered) +void ScMyTables::AddColumn(bool bIsCovered) { pCurrentTab->AddColumn(); if (pCurrentTab->GetSubTableSpanned() > 1) @@ -613,9 +613,9 @@ void ScMyTables::UpdateRowHeights() { const SdrPage* pPage = pDrawLayer ? pDrawLayer->GetPage(nTab) : NULL; if ( nTab == nVisible || ( pPage && pPage->GetObjCount() != 0 ) ) - aUpdateSheets.SelectTable( nTab, sal_True ); + aUpdateSheets.SelectTable( nTab, true ); else - pDoc->SetPendingRowHeights( nTab, sal_True ); + pDoc->SetPendingRowHeights( nTab, true ); } if (aUpdateSheets.GetSelectCount()) @@ -684,7 +684,7 @@ void ScMyTables::DeleteTable() if (sCurrentName != sCurrentSheetName && rImport.GetDocument()) { rImport.GetDocument()->RenameTab( nCurrentSheet, - sCurrentSheetName, false, sal_True); + sCurrentSheetName, false, true); } } } @@ -745,12 +745,12 @@ uno::Reference< drawing::XShapes > ScMyTables::GetCurrentXShapes() return xShapes; } -sal_Bool ScMyTables::HasDrawPage() +bool ScMyTables::HasDrawPage() { return !((nCurrentSheet != nCurrentDrawPage) || !xDrawPage.is()); } -sal_Bool ScMyTables::HasXShapes() +bool ScMyTables::HasXShapes() { return !((nCurrentSheet != nCurrentXShapes) || !xShapes.is()); } @@ -777,14 +777,14 @@ void ScMyTables::AddMatrixRange( aMatrixRangeList.push_back(aMRange); } -sal_Bool ScMyTables::IsPartOfMatrix(sal_Int32 nColumn, sal_Int32 nRow) +bool ScMyTables::IsPartOfMatrix(sal_Int32 nColumn, sal_Int32 nRow) { - sal_Bool bResult(false); + bool bResult(false); if (!aMatrixRangeList.empty()) { ScMyMatrixRangeList::iterator aItr(aMatrixRangeList.begin()); ScMyMatrixRangeList::iterator aEndItr(aMatrixRangeList.end()); - sal_Bool bReady(false); + bool bReady(false); while(!bReady && aItr != aEndItr) { if (nCurrentSheet > aItr->aRange.Sheet) @@ -798,11 +798,11 @@ sal_Bool ScMyTables::IsPartOfMatrix(sal_Int32 nColumn, sal_Int32 nRow) aItr = aMatrixRangeList.erase(aItr); } else if (nColumn < aItr->aRange.StartColumn) - bReady = sal_True; + bReady = true; else if (nColumn >= aItr->aRange.StartColumn && nColumn <= aItr->aRange.EndColumn && nRow >= aItr->aRange.StartRow && nRow <= aItr->aRange.EndRow) { - bReady = sal_True; - bResult = sal_True; + bReady = true; + bResult = true; } else ++aItr; diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index 45eac867b2ba..e3955e40cd50 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -77,7 +77,7 @@ public: void SetFirstColumn() { aTableCellPos.Column = -1; } sal_Int32 GetColsPerCol(const sal_Int32 nIndex) const { return nColsPerCol[nIndex]; } void SetColsPerCol(const sal_Int32 nIndex, sal_Int32 nValue = 1) { nColsPerCol[nIndex] = nValue; } - sal_Int32 GetRealCols(const sal_Int32 nIndex, const sal_Bool bIsNormal = sal_True) const; + sal_Int32 GetRealCols(const sal_Int32 nIndex, const bool bIsNormal = true) const; void SetRealCols(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealCols[nIndex] = nValue; } sal_Int32 GetRowsPerRow(const sal_Int32 nIndex) const { return nRowsPerRow[nIndex]; } void SetRowsPerRow(const sal_Int32 nIndex, const sal_Int32 nValue = 1) { nRowsPerRow[nIndex] = nValue; } @@ -145,7 +145,7 @@ private: SCTAB nCurrentSheet; ScMyTableData* pCurrentTab; - sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, + bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, const sal_Int32 nCol, const sal_Int32 nRow, com::sun::star::table::CellRangeAddress& aCellAddress) const; void UnMerge(); @@ -153,7 +153,7 @@ private: void InsertRow(); void NewRow(); void InsertColumn(); - void NewColumn(sal_Bool bIsCovered); + void NewColumn(bool bIsCovered); public: ScMyTables(ScXMLImport& rImport); ~ScMyTables(); @@ -161,11 +161,11 @@ public: const ScXMLTabProtectionData& rProtectData); void AddRow(); void SetRowStyle(const rtl::OUString& rCellStyleName); - void AddColumn(sal_Bool bIsCovered); + void AddColumn(bool bIsCovered); void NewTable(sal_Int32 nTempSpannedCols); void UpdateRowHeights(); void FixupOLEs() { aFixupOLEs.FixupOLEs(); } - sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const + bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const { return ScMyOLEFixer::IsOLE(rShape); } void DeleteTable(); com::sun::star::table::CellAddress GetRealCellPos(); @@ -184,8 +184,8 @@ public: GetCurrentXDrawPage(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > GetCurrentXShapes(); - sal_Bool HasDrawPage(); - sal_Bool HasXShapes(); + bool HasDrawPage(); + bool HasXShapes(); void AddOLE(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, const rtl::OUString &rRangeList); @@ -197,7 +197,7 @@ public: const rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar ); - sal_Bool IsPartOfMatrix(sal_Int32 nColumn, sal_Int32 nRow); + bool IsPartOfMatrix(sal_Int32 nColumn, sal_Int32 nRow); void SetMatrix( const com::sun::star::table::CellRangeAddress& rRange, const rtl::OUString& rFormula, const rtl::OUString& rFormulaNmsp, diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 08b602a8fb31..bc9a3cef11d1 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -155,13 +155,13 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const sal_Bool bTempIsSubTable, + const bool bTempIsSubTable, const sal_Int32 nSpannedCols) : SvXMLImportContext( rImport, nPrfx, rLName ), pExternalRefInfo(NULL), nStartOffset(-1), bStartFormPage(false), - bPrintEntireSheet(sal_True) + bPrintEntireSheet(true) { // get start offset in file (if available) nStartOffset = GetScImport().GetByteOffset(); @@ -291,12 +291,12 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, case XML_TOK_TABLE_COL_GROUP: pContext = new ScXMLTableColsContext( GetScImport(), nPrefix, rLName, xAttrList, - false, sal_True ); + false, true ); break; case XML_TOK_TABLE_HEADER_COLS: pContext = new ScXMLTableColsContext( GetScImport(), nPrefix, rLName, xAttrList, - sal_True, false ); + true, false ); break; case XML_TOK_TABLE_COLS: pContext = new ScXMLTableColsContext( GetScImport(), nPrefix, @@ -313,12 +313,12 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, case XML_TOK_TABLE_ROW_GROUP: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, rLName, xAttrList, - false, sal_True ); + false, true ); break; case XML_TOK_TABLE_HEADER_ROWS: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, rLName, xAttrList, - sal_True, false ); + true, false ); break; case XML_TOK_TABLE_ROWS: pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, @@ -343,7 +343,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, case XML_TOK_TABLE_FORMS: { GetScImport().GetFormImport()->startPage(GetScImport().GetTables().GetCurrentXDrawPage()); - bStartFormPage = sal_True; + bStartFormPage = true; pContext = GetScImport().GetFormImport()->createOfficeFormsContext( GetScImport(), nPrefix, rLName ); } break; diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index d3d7303d3203..8ccf8412d05b 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -51,8 +51,8 @@ class ScXMLTableContext : public SvXMLImportContext rtl::OUString sPrintRanges; ::std::auto_ptr<ScXMLExternalTabData> pExternalRefInfo; sal_Int32 nStartOffset; - sal_Bool bStartFormPage; - sal_Bool bPrintEntireSheet; + bool bStartFormPage; + bool bPrintEntireSheet; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -63,7 +63,7 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - const sal_Bool bTempIsSubTable = false, + const bool bTempIsSubTable = false, const sal_Int32 nSpannedCols = 0); virtual ~ScXMLTableContext(); diff --git a/xmloff/inc/xmloff/numehelp.hxx b/xmloff/inc/xmloff/numehelp.hxx index f6eeeed55877..e426b6e2a05f 100644 --- a/xmloff/inc/xmloff/numehelp.hxx +++ b/xmloff/inc/xmloff/numehelp.hxx @@ -89,7 +89,7 @@ public : ~XMLNumberFormatAttributesExportHelper(); void SetExport(SvXMLExport* pExp) { this->pExport = pExp; } - sal_Int16 GetCellType(const sal_Int32 nNumberFormat, rtl::OUString& sCurrency, sal_Bool& bIsStandard); + sal_Int16 GetCellType(const sal_Int32 nNumberFormat, rtl::OUString& sCurrency, bool& bIsStandard); static void WriteAttributes(SvXMLExport& rXMLExport, const sal_Int16 nTypeKey, const double& rValue, @@ -110,7 +110,7 @@ public : sal_Bool bExportTypeAttribute = sal_True); sal_Bool GetCurrencySymbol(const sal_Int32 nNumberFormat, rtl::OUString& rCurrencySymbol); - sal_Int16 GetCellType(const sal_Int32 nNumberFormat, sal_Bool& bIsStandard); + sal_Int16 GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard); void WriteAttributes(const sal_Int16 nTypeKey, const double& rValue, const rtl::OUString& rCurrencySymbol, diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx index c354fc5fbcaa..53e11180fd06 100644 --- a/xmloff/inc/xmloff/txtparae.hxx +++ b/xmloff/inc/xmloff/txtparae.hxx @@ -432,7 +432,7 @@ protected: const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextRange > & rTextRange, sal_Bool bAutoStyles, - sal_Bool& rPrevCharWasSpace ); + bool& rPrevCharWasSpace ); void exportListChange( const XMLTextNumRuleInfo& rPrvInfo, const XMLTextNumRuleInfo& rNextInfo ); @@ -571,7 +571,7 @@ public: // This method exports the given OUString void exportText( const ::rtl::OUString& rText, - sal_Bool& rPrevCharWasSpace ); + bool& rPrevCharWasSpace ); // This method collects all automatic styles for the given XText void collectTextAutoStyles( diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index a5c1680ede53..a708d21cf0f1 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -88,7 +88,7 @@ XMLNumberFormatAttributesExportHelper::~XMLNumberFormatAttributesExportHelper() { } -sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, rtl::OUString& sCurrency, sal_Bool& bIsStandard) +sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, rtl::OUString& sCurrency, bool& bIsStandard) { XMLNumberFormat aFormat(sEmpty, nNumberFormat, 0); XMLNumberFormatSet::iterator aItr(aNumberFormats.find(aFormat)); @@ -363,7 +363,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3 return sal_False; } -sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, sal_Bool& bIsStandard) +sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard) { if (!xNumberFormats.is() && pExport && pExport->GetNumberFormatsSupplier().is()) xNumberFormats.set(pExport->GetNumberFormatsSupplier()->getNumberFormats()); @@ -532,7 +532,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes( { if (pExport) { - sal_Bool bIsStandard; + bool bIsStandard; rtl::OUString sCurrency; sal_Int16 nTypeKey = GetCellType(nNumberFormat, sCurrency, bIsStandard); WriteAttributes(nTypeKey, rValue, sCurrency, bExportValue); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index aac49a603091..4e00ce513185 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -2197,7 +2197,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( sal_Bool bPrvChrIsSpc ) { static OUString sMeta(RTL_CONSTASCII_USTRINGPARAM("InContentMetadata")); - sal_Bool bPrevCharIsSpace = bPrvChrIsSpc; + bool bPrevCharIsSpace = bPrvChrIsSpc; while( rTextEnum->hasMoreElements() ) { @@ -2218,7 +2218,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( else if( sType.equals(sTextField)) { exportTextField( xTxtRange, bAutoStyles, bIsProgress ); - bPrevCharIsSpace = sal_False; + bPrevCharIsSpace = false; } else if( sType.equals( sFrame ) ) { @@ -2236,14 +2236,14 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( xSection, bIsProgress, sal_True, &xPropSet ); - bPrevCharIsSpace = sal_False; + bPrevCharIsSpace = false; } else if (sType.equals(sFootnote)) { exportTextFootnote(xPropSet, xTxtRange->getString(), bAutoStyles, bIsProgress ); - bPrevCharIsSpace = sal_False; + bPrevCharIsSpace = false; } else if (sType.equals(sBookmark)) { @@ -2342,7 +2342,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( if( xServiceInfo->supportsService( sTextFieldService ) ) { exportTextField( xTxtRange, bAutoStyles, bIsProgress ); - bPrevCharIsSpace = sal_False; + bPrevCharIsSpace = false; } else { @@ -3207,7 +3207,7 @@ sal_Bool XMLTextParagraphExport::addHyperlinkAttributes( void XMLTextParagraphExport::exportTextRange( const Reference < XTextRange > & rTextRange, sal_Bool bAutoStyles, - sal_Bool& rPrevCharIsSpace ) + bool& rPrevCharIsSpace ) { Reference < XPropertySet > xPropSet( rTextRange, UNO_QUERY ); if( bAutoStyles ) @@ -3267,7 +3267,7 @@ void XMLTextParagraphExport::exportTextRange( } void XMLTextParagraphExport::exportText( const OUString& rText, - sal_Bool& rPrevCharIsSpace ) + bool& rPrevCharIsSpace ) { sal_Int32 nExpStartPos = 0; sal_Int32 nEndPos = rText.getLength(); |