diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-08-28 21:07:51 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-08-28 22:48:11 +0200 |
| commit | b56108b3fb8e7e2a6d2650920c8fda3586a040d5 (patch) | |
| tree | f1b29b1abefcda414f4f55c46c416b4b28ea3365 /sc/source | |
| parent | 0294fa0ea81ab4b9625e5e8f0513ce94ea3217d7 (diff) | |
some additional sal_Bool -> bool in sc/source/filter/xml
Diffstat (limited to 'sc/source')
41 files changed, 383 insertions, 384 deletions
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index ac636249cf68..e5e8bb8c3630 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -61,9 +61,9 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r bIsIterationEnabled(false), bCalcAsShown(false), bIgnoreCase(false), - bLookUpLabels(sal_True), - bMatchWholeCell(sal_True), - bUseRegularExpressions(sal_True) + bLookUpLabels(true), + bMatchWholeCell(true), + bUseRegularExpressions(true) { aNullDate.Day = 30; aNullDate.Month = 12; @@ -82,12 +82,12 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r if (IsXMLToken(aLocalName, XML_CASE_SENSITIVE)) { if (IsXMLToken(sValue, XML_FALSE)) - bIgnoreCase = sal_True; + bIgnoreCase = true; } else if (IsXMLToken(aLocalName, XML_PRECISION_AS_SHOWN)) { if (IsXMLToken(sValue, XML_TRUE)) - bCalcAsShown = sal_True; + bCalcAsShown = true; } else if (IsXMLToken(aLocalName, XML_SEARCH_CRITERIA_MUST_APPLY_TO_WHOLE_CELL)) { @@ -236,7 +236,7 @@ ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, if (IsXMLToken(aLocalName, XML_STATUS)) { if (IsXMLToken(sValue, XML_ENABLE)) - pCalcSet->SetIterationStatus(sal_True); + pCalcSet->SetIterationStatus(true); } else if (IsXMLToken(aLocalName, XML_STEPS)) { diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index fb023bc0c740..519ba8ac04ac 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -40,12 +40,12 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext double fIterationEpsilon; sal_Int32 nIterationCount; sal_uInt16 nYear2000; - sal_Bool bIsIterationEnabled; - sal_Bool bCalcAsShown; - sal_Bool bIgnoreCase; - sal_Bool bLookUpLabels; - sal_Bool bMatchWholeCell; - sal_Bool bUseRegularExpressions; + bool bIsIterationEnabled; + bool bCalcAsShown; + bool bIgnoreCase; + bool bLookUpLabels; + bool bMatchWholeCell; + bool bUseRegularExpressions; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -63,7 +63,7 @@ public: ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); void SetNullDate(const com::sun::star::util::Date& aDate) { aNullDate = aDate; } - void SetIterationStatus(const sal_Bool bValue) { bIsIterationEnabled = bValue; } + void SetIterationStatus(const bool bValue) { bIsIterationEnabled = bValue; } void SetIterationCount(const sal_Int32 nValue) { nIterationCount = nValue; } void SetIterationEpsilon(const double fValue) { fIterationEpsilon = fValue; } virtual void EndElement(); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 603001452513..06d5ae419990 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -117,16 +117,16 @@ void ScChangeTrackingExportHelper::WriteBigRange(const ScBigRange& rBigRange, XM SvXMLUnitConverter::convertNumber(sBuffer, nEndSheet); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END_TABLE, sBuffer.makeStringAndClear()); } - SvXMLElementExport aBigRangeElem(rExport, XML_NAMESPACE_TABLE, aName, sal_True, sal_True); + SvXMLElementExport aBigRangeElem(rExport, XML_NAMESPACE_TABLE, aName, true, true); } void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction) { - SvXMLElementExport aElemInfo (rExport, XML_NAMESPACE_OFFICE, XML_CHANGE_INFO, sal_True, sal_True); + SvXMLElementExport aElemInfo (rExport, XML_NAMESPACE_OFFICE, XML_CHANGE_INFO, true, true); { SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC, - XML_CREATOR, sal_True, + XML_CREATOR, true, false ); rtl::OUString sAuthor(pAction->GetUser()); rExport.Characters(sAuthor); @@ -136,7 +136,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction rtl::OUStringBuffer sDate; ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(), sDate); SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC, - XML_DATE, sal_True, + XML_DATE, true, false ); rExport.Characters(sDate.makeStringAndClear()); } @@ -144,7 +144,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction rtl::OUString sComment(pAction->GetComment()); if (sComment.getLength()) { - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, false); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); bool bPrevCharWasSpace(true); rExport.GetTextParagraphExport()->exportText(sComment, bPrevCharWasSpace); } @@ -156,7 +156,7 @@ void ScChangeTrackingExportHelper::WriteGenerated(const ScChangeAction* pGenerat sal_uInt32 nActionNumber(pGeneratedAction->GetActionNumber()); OSL_ENSURE(pChangeTrack->IsGenerated(nActionNumber), "a not generated action found"); #endif - SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, sal_True, sal_True); + SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true); WriteBigRange(pGeneratedAction->GetBigRange(), XML_CELL_ADDRESS); String sValue; static_cast<const ScChangeActionContent*>(pGeneratedAction)->GetNewString(sValue); @@ -174,7 +174,7 @@ void ScChangeTrackingExportHelper::WriteDeleted(const ScChangeAction* pDeletedAc if (!pChangeTrack->IsGenerated(nActionNumber)) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(nActionNumber)); - SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, sal_True, sal_True); + SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_DELETION, true, true); if (static_cast<const ScChangeActionContent*>(pDeletedAction)->IsTopContent() && pDeletedAction->IsDeletedIn()) { String sValue; @@ -189,7 +189,7 @@ void ScChangeTrackingExportHelper::WriteDeleted(const ScChangeAction* pDeletedAc else { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(nActionNumber)); - SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_DELETION, sal_True, sal_True); + SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_DELETION, true, true); } } @@ -203,14 +203,14 @@ void ScChangeTrackingExportHelper::WriteDepending(const ScChangeAction* pDependA const bool bSaveBackwardsCompatible = ( rExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE ); SvXMLElementExport aDependElem(rExport, XML_NAMESPACE_TABLE, bSaveBackwardsCompatible ? XML_DEPENDENCE : XML_DEPENDENCY, - sal_True, sal_True); + true, true); } void ScChangeTrackingExportHelper::WriteDependings(ScChangeAction* pAction) { if (pAction->HasDependent()) { - SvXMLElementExport aDependingsElem (rExport, XML_NAMESPACE_TABLE, XML_DEPENDENCIES, sal_True, sal_True); + SvXMLElementExport aDependingsElem (rExport, XML_NAMESPACE_TABLE, XML_DEPENDENCIES, true, true); const ScChangeActionLinkEntry* pEntry = pAction->GetFirstDependentEntry(); while (pEntry) { @@ -220,7 +220,7 @@ void ScChangeTrackingExportHelper::WriteDependings(ScChangeAction* pAction) } if (pAction->HasDeleted()) { - SvXMLElementExport aDependingsElem (rExport, XML_NAMESPACE_TABLE, XML_DELETIONS, sal_True, sal_True); + SvXMLElementExport aDependingsElem (rExport, XML_NAMESPACE_TABLE, XML_DELETIONS, true, true); const ScChangeActionLinkEntry* pEntry = pAction->GetFirstDeletedEntry(); while (pEntry) { @@ -232,12 +232,12 @@ void ScChangeTrackingExportHelper::WriteDependings(ScChangeAction* pAction) void ScChangeTrackingExportHelper::WriteEmptyCell() { - SvXMLElementExport aElemEmptyCell(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemEmptyCell(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); } void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, const String& sValue) { - sal_Bool bSetAttributes(false); + bool bSetAttributes(false); if (sValue.Len()) { sal_uInt32 nIndex; @@ -257,7 +257,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons rtl::OUStringBuffer sBuffer; rExport.GetMM100UnitConverter().convertDateTime(sBuffer, fTempValue); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DATE_VALUE, sBuffer.makeStringAndClear()); - bSetAttributes = sal_True; + bSetAttributes = true; } } break; @@ -267,7 +267,7 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons rtl::OUStringBuffer sBuffer; rExport.GetMM100UnitConverter().convertTime(sBuffer, fTempValue); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_TIME_VALUE, sBuffer.makeStringAndClear()); - bSetAttributes = sal_True; + bSetAttributes = true; } break; } @@ -291,7 +291,7 @@ void ScChangeTrackingExportHelper::WriteValueCell(const ScBaseCell* pCell, const if (pValueCell) { SetValueAttributes(pValueCell->GetValue(), sValue); - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); } } @@ -304,10 +304,10 @@ void ScChangeTrackingExportHelper::WriteStringCell(const ScBaseCell* pCell) pStringCell->GetString(sString); rtl::OUString sOUString(sString); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING); - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); if (sOUString.getLength()) { - SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, false); + SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); bool bPrevCharWasSpace(true); rExport.GetTextParagraphExport()->exportText(sOUString, bPrevCharWasSpace); } @@ -322,7 +322,7 @@ void ScChangeTrackingExportHelper::WriteEditCell(const ScBaseCell* pCell) String sString; pEditCell->GetString(sString); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING); - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); if (sString.Len()) { if (!pEditTextObj) @@ -383,7 +383,7 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con if (pFormulaCell->IsValue()) { SetValueAttributes(pFormulaCell->GetValue(), sValue); - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); } else { @@ -391,10 +391,10 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con String sCellValue; pFormulaCell->GetString(sCellValue); rtl::OUString sOUValue(sCellValue); - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true); if (sOUValue.getLength()) { - SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, false); + SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false); bool bPrevCharWasSpace(true); rExport.GetTextParagraphExport()->exportText(sOUValue, bPrevCharWasSpace); } @@ -435,7 +435,7 @@ void ScChangeTrackingExportHelper::WriteCell(const ScBaseCell* pCell, const Stri void ScChangeTrackingExportHelper::WriteContentChange(ScChangeAction* pAction) { - SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_CHANGE, sal_True, sal_True); + SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_CELL_CONTENT_CHANGE, true, true); const ScChangeAction* pConstAction = pAction; WriteBigRange(pConstAction->GetBigRange(), XML_CELL_ADDRESS); WriteChangeInfo(pAction); @@ -444,7 +444,7 @@ void ScChangeTrackingExportHelper::WriteContentChange(ScChangeAction* pAction) ScChangeActionContent* pPrevAction = static_cast<ScChangeActionContent*>(pAction)->GetPrevContent(); if (pPrevAction) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pPrevAction->GetActionNumber())); - SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_PREVIOUS, sal_True, sal_True); + SvXMLElementExport aElemPrev(rExport, XML_NAMESPACE_TABLE, XML_PREVIOUS, true, true); String sValue; static_cast<ScChangeActionContent*>(pAction)->GetOldString(sValue); WriteCell(static_cast<ScChangeActionContent*>(pAction)->GetOldCell(), sValue); @@ -516,7 +516,7 @@ void ScChangeTrackingExportHelper::AddInsertionAttributes(const ScChangeAction* void ScChangeTrackingExportHelper::WriteInsertion(ScChangeAction* pAction) { AddInsertionAttributes(pAction); - SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_INSERTION, sal_True, sal_True); + SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_INSERTION, true, true); WriteChangeInfo(pAction); WriteDependings(pAction); } @@ -569,12 +569,12 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel if (pDelAction->IsMultiDelete() && !pDelAction->GetDx() && !pDelAction->GetDy()) { const ScChangeAction* p = pDelAction->GetNext(); - sal_Bool bAll(false); + bool bAll(false); sal_Int32 nSlavesCount (1); while (!bAll && p) { if ( !p || p->GetType() != pDelAction->GetType() ) - bAll = sal_True; + bAll = true; else { const ScChangeActionDel* pDel = (const ScChangeActionDel*) p; @@ -585,7 +585,7 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel p = p->GetNext(); } else - bAll = sal_True; + bAll = true; } } @@ -601,14 +601,14 @@ void ScChangeTrackingExportHelper::WriteCutOffs(const ScChangeActionDel* pAction const ScChangeActionDelMoveEntry* pLinkMove = pAction->GetFirstMoveEntry(); if (pCutOffIns || pLinkMove) { - SvXMLElementExport aCutOffsElem (rExport, XML_NAMESPACE_TABLE, XML_CUT_OFFS, sal_True, sal_True); + SvXMLElementExport aCutOffsElem (rExport, XML_NAMESPACE_TABLE, XML_CUT_OFFS, true, true); rtl::OUStringBuffer sBuffer; if (pCutOffIns) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ID, GetChangeID(pCutOffIns->GetActionNumber())); SvXMLUnitConverter::convertNumber(sBuffer, static_cast<sal_Int32>(pAction->GetCutOffCount())); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_POSITION, sBuffer.makeStringAndClear()); - SvXMLElementExport aInsertCutOffElem (rExport, XML_NAMESPACE_TABLE, XML_INSERTION_CUT_OFF, sal_True, sal_True); + SvXMLElementExport aInsertCutOffElem (rExport, XML_NAMESPACE_TABLE, XML_INSERTION_CUT_OFF, true, true); } while (pLinkMove) { @@ -625,7 +625,7 @@ void ScChangeTrackingExportHelper::WriteCutOffs(const ScChangeActionDel* pAction SvXMLUnitConverter::convertNumber(sBuffer, static_cast<sal_Int32>(pLinkMove->GetCutOffTo())); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END_POSITION, sBuffer.makeStringAndClear()); } - SvXMLElementExport aMoveCutOffElem (rExport, XML_NAMESPACE_TABLE, XML_MOVEMENT_CUT_OFF, sal_True, sal_True); + SvXMLElementExport aMoveCutOffElem (rExport, XML_NAMESPACE_TABLE, XML_MOVEMENT_CUT_OFF, true, true); pLinkMove = pLinkMove->GetNext(); } } @@ -635,7 +635,7 @@ void ScChangeTrackingExportHelper::WriteDeletion(ScChangeAction* pAction) { ScChangeActionDel* pDelAction = static_cast<ScChangeActionDel*> (pAction); AddDeletionAttributes(pDelAction, pDelAction); - SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_DELETION, sal_True, sal_True); + SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_DELETION, true, true); WriteChangeInfo(pDelAction); WriteDependings(pDelAction); WriteCutOffs(pDelAction); @@ -644,7 +644,7 @@ void ScChangeTrackingExportHelper::WriteDeletion(ScChangeAction* pAction) void ScChangeTrackingExportHelper::WriteMovement(ScChangeAction* pAction) { const ScChangeActionMove* pMoveAction = static_cast<ScChangeActionMove*> (pAction); - SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_MOVEMENT, sal_True, sal_True); + SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_MOVEMENT, true, true); WriteBigRange(pMoveAction->GetFromRange(), XML_SOURCE_RANGE_ADDRESS); WriteBigRange(pMoveAction->GetBigRange(), XML_TARGET_RANGE_ADDRESS); WriteChangeInfo(pAction); @@ -653,7 +653,7 @@ void ScChangeTrackingExportHelper::WriteMovement(ScChangeAction* pAction) void ScChangeTrackingExportHelper::WriteRejection(ScChangeAction* pAction) { - SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_REJECTION, sal_True, sal_True); + SvXMLElementExport aElemChange(rExport, XML_NAMESPACE_TABLE, XML_REJECTION, true, true); WriteChangeInfo(pAction); WriteDependings(pAction); } @@ -744,7 +744,7 @@ void ScChangeTrackingExportHelper::CollectAndWriteChanges() { if (pChangeTrack) { - SvXMLElementExport aCangeListElem(rExport, XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, sal_True, sal_True); + SvXMLElementExport aCangeListElem(rExport, XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, true, true); { ScChangeAction* pAction = pChangeTrack->GetFirst(); if (pAction) diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 1584f471ea44..04ff68fc9ebf 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -464,7 +464,7 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S // old files didn't store 100th seconds, enable again if ( aInfo.aDateTime.HundredthSeconds ) - pTrack->SetTime100thSeconds( sal_True ); + pTrack->SetTime100thSeconds( true ); StrData aStrData( aInfo.sUser ); sal_uInt16 nPos; @@ -810,7 +810,7 @@ void ScXMLChangeTrackingImportHelper::SetNewCell(ScMyContentAction* pAction) static_cast<ScFormulaCell*>(pCell)->GetMatColsRows(nCols, nRows); static_cast<ScFormulaCell*>(pNewCell)->SetMatColsRows(nCols, nRows); } - static_cast<ScFormulaCell*>(pNewCell)->SetInChangeTrack(sal_True); + static_cast<ScFormulaCell*>(pNewCell)->SetInChangeTrack(true); } } pChangeActionContent->SetNewCell(pNewCell, pDoc, EMPTY_STRING); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index 5a98df08a2c7..b21e07004a97 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -196,7 +196,7 @@ class ScXMLChangeTrackingImportHelper sal_uInt32 nPrefixLength; sal_Int16 nMultiSpanned; sal_Int16 nMultiSpannedSlaveCount; - sal_Bool bChangeTrack; + bool bChangeTrack; private: void ConvertInfo(const ScMyActionInfo& aInfo, String& rUser, DateTime& aDateTime); @@ -212,7 +212,7 @@ public: ScXMLChangeTrackingImportHelper(); ~ScXMLChangeTrackingImportHelper(); - void SetChangeTrack(sal_Bool bValue) { bChangeTrack = bValue; } + void SetChangeTrack(bool bValue) { bChangeTrack = bValue; } void SetProtection(const com::sun::star::uno::Sequence<sal_Int8>& rProtect) { aProtect = rProtect; } void StartChangeAction(const ScChangeActionType nActionType); diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx index 858adcffeb6f..b7848b4d8b7b 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx @@ -46,13 +46,13 @@ ScMyColumnRowGroup::ScMyColumnRowGroup() { } -sal_Bool ScMyColumnRowGroup::operator<(const ScMyColumnRowGroup& rGroup) const +bool ScMyColumnRowGroup::operator<(const ScMyColumnRowGroup& rGroup) const { if (rGroup.nField > nField) - return sal_True; + return true; else if (rGroup.nField == nField && rGroup.nLevel > nLevel) - return sal_True; + return true; else return false; } @@ -81,9 +81,9 @@ void ScMyOpenCloseColumnRowGroup::AddGroup(const ScMyColumnRowGroup& aGroup, con aTableEnd.push_back(nEndField); } -sal_Bool ScMyOpenCloseColumnRowGroup::IsGroupStart(const sal_Int32 nField) +bool ScMyOpenCloseColumnRowGroup::IsGroupStart(const sal_Int32 nField) { - sal_Bool bGroupStart(false); + bool bGroupStart(false); if (!aTableStart.empty()) { ScMyColumnRowGroupVec::iterator aItr(aTableStart.begin()); @@ -104,7 +104,7 @@ sal_Bool ScMyOpenCloseColumnRowGroup::IsGroupStart(const sal_Int32 nField) } if (nItrField == nField) - bGroupStart = sal_True; + bGroupStart = true; } return bGroupStart; } @@ -113,14 +113,14 @@ void ScMyOpenCloseColumnRowGroup::OpenGroup(const ScMyColumnRowGroup& rGroup) { if (!rGroup.bDisplay) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, XML_FALSE); - rExport.StartElement( rName, sal_True); + rExport.StartElement( rName, true); } void ScMyOpenCloseColumnRowGroup::OpenGroups(const sal_Int32 nField) { ScMyColumnRowGroupVec::iterator aItr(aTableStart.begin()); ScMyColumnRowGroupVec::iterator aEndItr(aTableStart.end()); - sal_Bool bReady(false); + bool bReady(false); while(!bReady && aItr != aEndItr) { if (aItr->nField == nField) @@ -129,31 +129,31 @@ void ScMyOpenCloseColumnRowGroup::OpenGroups(const sal_Int32 nField) aItr = aTableStart.erase(aItr); } else - bReady = sal_True; + bReady = true; } } -sal_Bool ScMyOpenCloseColumnRowGroup::IsGroupEnd(const sal_Int32 nField) +bool ScMyOpenCloseColumnRowGroup::IsGroupEnd(const sal_Int32 nField) { - sal_Bool bGroupEnd(false); + bool bGroupEnd(false); if (!aTableEnd.empty()) { if (*(aTableEnd.begin()) == nField) - bGroupEnd = sal_True; + bGroupEnd = true; } return bGroupEnd; } void ScMyOpenCloseColumnRowGroup::CloseGroup() { - rExport.EndElement( rName, sal_True ); + rExport.EndElement( rName, true ); } void ScMyOpenCloseColumnRowGroup::CloseGroups(const sal_Int32 nField) { ScMyFieldGroupVec::iterator aItr(aTableEnd.begin()); ScMyFieldGroupVec::iterator aEndItr(aTableEnd.end()); - sal_Bool bReady(false); + bool bReady(false); while(!bReady && aItr != aEndItr) { if (*aItr == nField) @@ -162,7 +162,7 @@ void ScMyOpenCloseColumnRowGroup::CloseGroups(const sal_Int32 nField) aItr = aTableEnd.erase(aItr); } else - bReady = sal_True; + bReady = true; } } diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx index 37608b737f5e..8e3a361d1577 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx @@ -37,10 +37,10 @@ struct ScMyColumnRowGroup { sal_Int32 nField; sal_Int16 nLevel; - sal_Bool bDisplay; + bool bDisplay; ScMyColumnRowGroup(); - sal_Bool operator< (const ScMyColumnRowGroup& rGroup) const; + bool operator< (const ScMyColumnRowGroup& rGroup) const; }; typedef std::list <ScMyColumnRowGroup> ScMyColumnRowGroupVec; @@ -62,9 +62,9 @@ public: void NewTable(); void AddGroup(const ScMyColumnRowGroup& aGroup, const sal_Int32 nEndField); - sal_Bool IsGroupStart(const sal_Int32 nField); + bool IsGroupStart(const sal_Int32 nField); void OpenGroups(const sal_Int32 nField); - sal_Bool IsGroupEnd(const sal_Int32 nField); + bool IsGroupEnd(const sal_Int32 nField); void CloseGroups(const sal_Int32 nField); sal_Int32 GetLast(); void Sort(); diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 5f96bad52719..d95905e5e2f0 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -143,11 +143,11 @@ void ScXMLConsolidationContext::EndElement() aConsParam.bByCol = aConsParam.bByRow = false; if( IsXMLToken(sUseLabel, XML_COLUMN ) ) - aConsParam.bByCol = sal_True; + aConsParam.bByCol = true; else if( IsXMLToken( sUseLabel, XML_ROW ) ) - aConsParam.bByRow = sal_True; + aConsParam.bByRow = true; else if( IsXMLToken( sUseLabel, XML_BOTH ) ) - aConsParam.bByCol = aConsParam.bByRow = sal_True; + aConsParam.bByCol = aConsParam.bByRow = true; aConsParam.bReferenceData = bLinkToSource; diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index eabf35031dbf..6b08f1099e1b 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -45,8 +45,8 @@ private: ::rtl::OUString sUseLabel; ScAddress aTargetAddr; ScSubTotalFunc eFunction; - sal_Bool bLinkToSource; - sal_Bool bTargetAddr; + bool bLinkToSource; + bool bTargetAddr; protected: const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index e7fd8f030a12..5997e4f55df6 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -123,7 +123,7 @@ ScSubTotalFunc ScXMLConverter::GetSubTotalFuncFromString( const OUString& sFunct void ScXMLConverter::GetStringFromFunction( OUString& rString, const sheet::GeneralFunction eFunction, - sal_Bool bAppendStr ) + bool bAppendStr ) { OUString sFuncStr; switch( eFunction ) @@ -152,7 +152,7 @@ void ScXMLConverter::GetStringFromFunction( void ScXMLConverter::GetStringFromFunction( OUString& rString, const ScSubTotalFunc eFunction, - sal_Bool bAppendStr ) + bool bAppendStr ) { OUString sFuncStr; switch( eFunction ) @@ -196,7 +196,7 @@ sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( void ScXMLConverter::GetStringFromOrientation( OUString& rString, const sheet::DataPilotFieldOrientation eOrientation, - sal_Bool bAppendStr ) + bool bAppendStr ) { OUString sOrientStr; switch( eOrientation ) @@ -238,7 +238,7 @@ ScDetectiveObjType ScXMLConverter::GetDetObjTypeFromString( const OUString& rStr return SC_DETOBJ_NONE; } -sal_Bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const OUString& rString ) +bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const OUString& rString ) { if( IsXMLToken(rString, XML_TRACE_DEPENDENTS ) ) rDetOpType = SCDETOP_ADDSUCC; @@ -252,7 +252,7 @@ sal_Bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const rDetOpType = SCDETOP_DELPRED; else return false; - return sal_True; + return true; } @@ -261,7 +261,7 @@ sal_Bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const void ScXMLConverter::GetStringFromDetObjType( OUString& rString, const ScDetectiveObjType eObjType, - sal_Bool bAppendStr ) + bool bAppendStr ) { OUString sTypeStr; switch( eObjType ) @@ -286,7 +286,7 @@ void ScXMLConverter::GetStringFromDetObjType( void ScXMLConverter::GetStringFromDetOpType( OUString& rString, const ScDetOpType eOpType, - sal_Bool bAppendStr ) + bool bAppendStr ) { OUString sTypeStr; switch( eOpType ) @@ -313,11 +313,11 @@ void ScXMLConverter::GetStringFromDetOpType( //___________________________________________________________________ -void ScXMLConverter::ParseFormula(OUString& sFormula, const sal_Bool bIsFormula) +void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) { OUStringBuffer sBuffer(sFormula.getLength()); - sal_Bool bInQuotationMarks(false); - sal_Bool bInDoubleQuotationMarks(false); + bool bInQuotationMarks(false); + bool bInDoubleQuotationMarks(false); sal_Int16 nCountBraces(0); sal_Unicode chPrevious('='); for (sal_Int32 i = 0; i < sFormula.getLength(); ++i) diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index a661bc532d01..995e3e86e91a 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -68,11 +68,11 @@ public: static void GetStringFromFunction( ::rtl::OUString& rString, const ::com::sun::star::sheet::GeneralFunction eFunction, - sal_Bool bAppendStr = false ); + bool bAppendStr = false ); static void GetStringFromFunction( ::rtl::OUString& rString, const ScSubTotalFunc eFunction, - sal_Bool bAppendStr = false ); + bool bAppendStr = false ); // IMPORT: DataPilotFieldOrientation static ::com::sun::star::sheet::DataPilotFieldOrientation @@ -83,13 +83,13 @@ public: static void GetStringFromOrientation( ::rtl::OUString& rString, const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation, - sal_Bool bAppendStr = false ); + bool bAppendStr = false ); // IMPORT: Detective static ScDetectiveObjType GetDetObjTypeFromString( const ::rtl::OUString& rString ); - static sal_Bool GetDetOpTypeFromString( + static bool GetDetOpTypeFromString( ScDetOpType& rDetOpType, const ::rtl::OUString& rString ); @@ -97,16 +97,16 @@ public: static void GetStringFromDetObjType( ::rtl::OUString& rString, const ScDetectiveObjType eObjType, - sal_Bool bAppendStr = false ); + bool bAppendStr = false ); static void GetStringFromDetOpType( ::rtl::OUString& rString, const ScDetOpType eOpType, - sal_Bool bAppendStr = false ); + bool bAppendStr = false ); // IMPORT: Formulas static void ParseFormula( ::rtl::OUString& sFormula, - const sal_Bool bIsFormula = sal_True); + const bool bIsFormula = sal_True); // EXPORT: Core Date Time static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index ba37d51c7b69..e43503c927ba 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -419,9 +419,9 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, sValue(), fValue(), nCells(1), - bString(sal_True), - bString2(sal_True), - bEmpty(sal_True), + bString(true), + bString2(true), + bEmpty(true), pDDELink(pTempDDELink) { if( !xAttrList.is() ) return; @@ -440,7 +440,7 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, if (IsXMLToken(aLocalName, XML_VALUE_TYPE)) { if (IsXMLToken(sTempValue, XML_STRING)) - bString = sal_True; + bString = true; else bString = false; } @@ -448,7 +448,7 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, { sValue = sTempValue; bEmpty = false; - bString2 = sal_True; + bString2 = true; } else if (IsXMLToken(aLocalName, XML_VALUE)) { diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index 2af8015d6476..3a4ceee5e04d 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -59,8 +59,8 @@ struct ScDDELinkCell { rtl::OUString sValue; double fValue; - sal_Bool bString; - sal_Bool bEmpty; + bool bString; + bool bEmpty; }; typedef std::list<ScDDELinkCell> ScDDELinkCells; @@ -203,9 +203,9 @@ class ScXMLDDECellContext : public SvXMLImportContext rtl::OUString sValue; double fValue; sal_Int32 nCells; - sal_Bool bString; - sal_Bool bString2; - sal_Bool bEmpty; + bool bString; + bool bString2; + bool bEmpty; ScXMLDDELinkContext* pDDELink; diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index 812b66b345f5..a0b1d2f434d3 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -59,7 +59,7 @@ ScMyImpDetectiveObj::ScMyImpDetectiveObj() : //___________________________________________________________________ -sal_Bool ScMyImpDetectiveOp::operator<(const ScMyImpDetectiveOp& rDetOp) const +bool ScMyImpDetectiveOp::operator<(const ScMyImpDetectiveOp& rDetOp) const { return (nIndex < rDetOp.nIndex); } @@ -69,14 +69,14 @@ void ScMyImpDetectiveOpArray::Sort() aDetectiveOpList.sort(); } -sal_Bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp ) +bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp ) { if( aDetectiveOpList.empty() ) return false; ScMyImpDetectiveOpList::iterator aItr = aDetectiveOpList.begin(); rDetOp = *aItr; aDetectiveOpList.erase( aItr ); - return sal_True; + return true; } @@ -195,7 +195,7 @@ void ScXMLDetectiveHighlightedContext::EndElement() break; case SC_DETOBJ_FROMOTHERTAB: case SC_DETOBJ_CIRCLE: - bValid = sal_True; + bValid = true; break; default: bValid = false; diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 0e7c8c5a957f..6d4700327684 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -45,7 +45,7 @@ struct ScMyImpDetectiveObj { ScRange aSourceRange; ScDetectiveObjType eObjType; - sal_Bool bHasError; + bool bHasError; ScMyImpDetectiveObj(); }; @@ -62,7 +62,7 @@ struct ScMyImpDetectiveOp sal_Int32 nIndex; inline ScMyImpDetectiveOp() : nIndex( -1 ) {} - sal_Bool operator<(const ScMyImpDetectiveOp& rDetOp) const; + bool operator<(const ScMyImpDetectiveOp& rDetOp) const; }; typedef ::std::list< ScMyImpDetectiveOp > ScMyImpDetectiveOpList; @@ -80,7 +80,7 @@ public: { aDetectiveOpList.push_back( rDetOp ); } void Sort(); - sal_Bool GetFirstOp( ScMyImpDetectiveOp& rDetOp ); + bool GetFirstOp( ScMyImpDetectiveOp& rDetOp ); }; @@ -119,7 +119,7 @@ class ScXMLDetectiveHighlightedContext : public SvXMLImportContext private: ScMyImpDetectiveObjVec* pDetectiveObjVec; ScMyImpDetectiveObj aDetectiveObj; - sal_Bool bValid; + bool bValid; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -149,7 +149,7 @@ class ScXMLDetectiveOperationContext : public SvXMLImportContext { private: ScMyImpDetectiveOp aDetectiveOp; - sal_Bool bHasType; + bool bHasType; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index 8c836d0aec96..831a3b8bfcf9 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -35,7 +35,6 @@ class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { rtl::OUString sPrintRanges; - sal_Bool bStartFormPage; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx index 70e83b284008..5c7cd285e567 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.cxx +++ b/sc/source/filter/xml/XMLExportDDELinks.cxx @@ -56,12 +56,12 @@ ScXMLExportDDELinks::~ScXMLExportDDELinks() { } -sal_Bool ScXMLExportDDELinks::CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue, - const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue) const +bool ScXMLExportDDELinks::CellsEqual(const bool bPrevEmpty, const bool bPrevString, const String& sPrevValue, const double& fPrevValue, + const bool bEmpty, const bool bString, const String& sValue, const double& fValue) const { if (bEmpty == bPrevEmpty) if (bEmpty) - return sal_True; + return true; else if (bString == bPrevString) if (bString) return (sPrevValue == sValue); @@ -100,7 +100,7 @@ void ScXMLExportDDELinks::WriteCell(const ScMatrixValue& aVal, sal_Int32 nRepeat rExport.GetMM100UnitConverter().convertNumber(aBuf, nRepeat); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, aBuf.makeStringAndClear()); } - SvXMLElementExport(rExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True); + SvXMLElementExport(rExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true); } void ScXMLExportDDELinks::WriteTable(const sal_Int32 nPos) @@ -116,7 +116,7 @@ void ScXMLExportDDELinks::WriteTable(const sal_Int32 nPos) SCSIZE nCols, nRows; pMatrix->GetDimensions(nCols, nRows); - SvXMLElementExport aTableElem(rExport, XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True); + SvXMLElementExport aTableElem(rExport, XML_NAMESPACE_TABLE, XML_TABLE, true, true); if (nCols > 1) { OUStringBuffer aBuf; @@ -124,14 +124,14 @@ void ScXMLExportDDELinks::WriteTable(const sal_Int32 nPos) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, aBuf.makeStringAndClear()); } { - SvXMLElementExport aElemCol(rExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True); + SvXMLElementExport aElemCol(rExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true); } for (SCSIZE nRow = 0; nRow < nRows; ++nRow) { sal_Int32 nRepeat = 0; ScMatrixValue aPrevVal; - SvXMLElementExport aElemRow(rExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True); + SvXMLElementExport aElemRow(rExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true); for (SCSIZE nCol = 0; nCol < nCols; ++nCol, ++nRepeat) { ScMatrixValue aVal = pMatrix->Get(nCol, nRow); @@ -159,13 +159,13 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference<sheet::XSpreadsheetDocume sal_Int32 nCount = xIndex->getCount(); if (nCount) { - SvXMLElementExport aElemDDEs(rExport, XML_NAMESPACE_TABLE, XML_DDE_LINKS, sal_True, sal_True); + SvXMLElementExport aElemDDEs(rExport, XML_NAMESPACE_TABLE, XML_DDE_LINKS, true, true); for (sal_uInt16 nDDELink = 0; nDDELink < nCount; ++nDDELink) { uno::Reference<sheet::XDDELink> xDDELink(xIndex->getByIndex(nDDELink), uno::UNO_QUERY); if (xDDELink.is()) { - SvXMLElementExport aElemDDE(rExport, XML_NAMESPACE_TABLE, XML_DDE_LINK, sal_True, sal_True); + SvXMLElementExport aElemDDE(rExport, XML_NAMESPACE_TABLE, XML_DDE_LINK, true, true); { rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, xDDELink->getApplication()); rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_DDE_TOPIC, xDDELink->getTopic()); @@ -185,7 +185,7 @@ void ScXMLExportDDELinks::WriteDDELinks(uno::Reference<sheet::XSpreadsheetDocume break; } } - SvXMLElementExport(rExport, XML_NAMESPACE_OFFICE, XML_DDE_SOURCE, sal_True, sal_True); + SvXMLElementExport(rExport, XML_NAMESPACE_OFFICE, XML_DDE_SOURCE, true, true); } WriteTable(nDDELink); } diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx index bb58ddb49856..74171a97cafb 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.hxx +++ b/sc/source/filter/xml/XMLExportDDELinks.hxx @@ -39,8 +39,8 @@ class ScXMLExportDDELinks { ScXMLExport& rExport; - sal_Bool CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue, - const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue) const; + bool CellsEqual(const bool bPrevEmpty, const bool bPrevString, const String& sPrevValue, const double& fPrevValue, + const bool bEmpty, const bool bString, const String& sValue, const double& fValue) const; void WriteCell(const ScMatrixValue& aVal, sal_Int32 nRepeat); void WriteTable(const sal_Int32 nPos); public: diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 57c275aa870d..81980443d3cc 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -76,8 +76,8 @@ ScXMLExportDataPilot::~ScXMLExportDataPilot() { } -rtl::OUString ScXMLExportDataPilot::getDPOperatorXML(const ScQueryOp aFilterOperator, const sal_Bool bUseRegularExpressions, - const sal_Bool bIsString, const double dVal, const String& sVal) const +rtl::OUString ScXMLExportDataPilot::getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions, + const bool bIsString, const double dVal, const String& sVal) const { switch (aFilterOperator) { @@ -128,7 +128,7 @@ rtl::OUString ScXMLExportDataPilot::getDPOperatorXML(const ScQueryOp aFilterOper return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); } -void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, sal_Bool bIsCaseSensitive, sal_Bool bUseRegularExpressions) +void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(sal_Int32(aQueryEntry.nField))); if (bIsCaseSensitive) @@ -144,7 +144,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, sal } rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, getDPOperatorXML(aQueryEntry.eOp, bUseRegularExpressions, aQueryEntry.bQueryByString, aQueryEntry.nVal, *aQueryEntry.pStr)); - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, true, true); } void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) @@ -152,9 +152,9 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) SCSIZE nQueryEntryCount = aQueryParam.GetEntryCount(); if (nQueryEntryCount > 0) { - sal_Bool bAnd(false); - sal_Bool bOr(false); - sal_Bool bHasEntries(sal_True); + bool bAnd(false); + bool bOr(false); + bool bHasEntries(true); SCSIZE nEntries(0); SCSIZE j; @@ -166,9 +166,9 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) if (nEntries > 0) { if (aEntry.eConnect == SC_AND) - bAnd = sal_True; + bAnd = true; else - bOr = sal_True; + bOr = true; } ++nEntries; } @@ -190,7 +190,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) } if (!aQueryParam.bDuplicate) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_FALSE); - SvXMLElementExport aElemDPF(rExport, XML_NAMESPACE_TABLE, XML_FILTER, sal_True, sal_True); + SvXMLElementExport aElemDPF(rExport, XML_NAMESPACE_TABLE, XML_FILTER, true, true); rExport.CheckAttrList(); if (nQueryEntryCount == 1) { @@ -198,7 +198,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) } else if (bOr && !bAnd) { - SvXMLElementExport aElemOr(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, sal_True, sal_True); + SvXMLElementExport aElemOr(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, true, true); for (j = 0; j < nQueryEntryCount; ++j) { WriteDPCondition(aQueryParam.GetEntry(j), aQueryParam.bCaseSens, aQueryParam.bRegExp); @@ -206,7 +206,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) } else if (bAnd && !bOr) { - SvXMLElementExport aElemAnd(rExport, XML_NAMESPACE_TABLE, XML_FILTER_AND, sal_True, sal_True); + SvXMLElementExport aElemAnd(rExport, XML_NAMESPACE_TABLE, XML_FILTER_AND, true, true); for (j = 0; j < nQueryEntryCount; ++j) { WriteDPCondition(aQueryParam.GetEntry(j), aQueryParam.bCaseSens, aQueryParam.bRegExp); @@ -214,15 +214,15 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) } else { - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, true, true); ScQueryEntry aPrevFilterField(aQueryParam.GetEntry(0)); ScQueryConnect aConnection = aQueryParam.GetEntry(1).eConnect; - sal_Bool bOpenAndElement; + bool bOpenAndElement; rtl::OUString aName(rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND))); if (aConnection == SC_AND) { - rExport.StartElement( aName, sal_True ); - bOpenAndElement = sal_True; + rExport.StartElement( aName, true ); + bOpenAndElement = true; } else bOpenAndElement = false; @@ -233,14 +233,14 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) aConnection = aQueryParam.GetEntry(j).eConnect; if (aQueryParam.GetEntry(j).eConnect == SC_AND) { - rExport.StartElement( aName, sal_True ); - bOpenAndElement = sal_True; + rExport.StartElement( aName, true ); + bOpenAndElement = true; WriteDPCondition(aPrevFilterField, aQueryParam.bCaseSens, aQueryParam.bRegExp); aPrevFilterField = aQueryParam.GetEntry(j); if (j == nQueryEntryCount - 1) { WriteDPCondition(aPrevFilterField, aQueryParam.bCaseSens, aQueryParam.bRegExp); - rExport.EndElement(aName, sal_True); + rExport.EndElement(aName, true); bOpenAndElement = false; } } @@ -250,7 +250,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) aPrevFilterField = aQueryParam.GetEntry(j); if (bOpenAndElement) { - rExport.EndElement(aName, sal_True); + rExport.EndElement(aName, true); bOpenAndElement = false; } if (j == nQueryEntryCount - 1) @@ -334,7 +334,7 @@ void ScXMLExportDataPilot::WriteFieldReference(ScDPSaveDimension* pDim) if (sValueStr.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_MEMBER_TYPE, sValueStr); } - SvXMLElementExport aElemDPFR(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE, sal_True, sal_True); + SvXMLElementExport aElemDPFR(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE, true, true); } rExport.CheckAttrList(); } @@ -369,7 +369,7 @@ void ScXMLExportDataPilot::WriteSortInfo(ScDPSaveDimension* pDim) } if (sValueStr.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SORT_MODE, sValueStr); - SvXMLElementExport aElemDPLSI(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, sal_True, sal_True); + SvXMLElementExport aElemDPLSI(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, true, true); } } @@ -402,7 +402,7 @@ void ScXMLExportDataPilot::WriteAutoShowInfo(ScDPSaveDimension* pDim) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_FIELD, pAutoInfo->DataField); - SvXMLElementExport aElemDPLAI(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, sal_True, sal_True); + SvXMLElementExport aElemDPLAI(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, true, true); } } @@ -431,7 +431,7 @@ void ScXMLExportDataPilot::WriteLayoutInfo(ScDPSaveDimension* pDim) } if (sValueStr.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_LAYOUT_MODE, sValueStr); - SvXMLElementExport aElemDPLLI(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, sal_True, sal_True); + SvXMLElementExport aElemDPLLI(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, true, true); } } @@ -447,7 +447,7 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim) if (nSubTotalCount > 0) { - SvXMLElementExport aElemSTs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, sal_True, sal_True); + SvXMLElementExport aElemSTs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, true, true); rExport.CheckAttrList(); for (sal_Int32 nSubTotal = 0; nSubTotal < nSubTotalCount; nSubTotal++) { @@ -457,7 +457,7 @@ void ScXMLExportDataPilot::WriteSubTotals(ScDPSaveDimension* pDim) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction); if (pLayoutName && nFunc == sheet::GeneralFunction_AUTO) rExport.AddAttribute(XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, *pLayoutName); - SvXMLElementExport aElemST(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, sal_True, sal_True); + SvXMLElementExport aElemST(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, true, true); } } } @@ -467,7 +467,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) const ScDPSaveDimension::MemberList &rMembers = pDim->GetMembers(); if (rMembers.begin() != rMembers.end()) { - SvXMLElementExport aElemDPMs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, sal_True, sal_True); + SvXMLElementExport aElemDPMs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, true, true); rExport.CheckAttrList(); for (ScDPSaveDimension::MemberList::const_iterator i=rMembers.begin(); i != rMembers.end() ; ++i) { @@ -486,7 +486,7 @@ void ScXMLExportDataPilot::WriteMembers(ScDPSaveDimension* pDim) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY, sBuffer.makeStringAndClear()); SvXMLUnitConverter::convertBool(sBuffer, (*i)->GetShowDetails()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_DETAILS, sBuffer.makeStringAndClear()); - SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, sal_True, sal_True); + SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, true, true); rExport.CheckAttrList(); } } @@ -501,7 +501,7 @@ void ScXMLExportDataPilot::WriteLevels(ScDPSaveDimension* pDim) SvXMLUnitConverter::convertBool(sBuffer, pDim->GetShowEmpty()); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, sBuffer.makeStringAndClear()); } - SvXMLElementExport aElemDPL(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, sal_True, sal_True); + SvXMLElementExport aElemDPL(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, true, true); WriteSubTotals(pDim); WriteMembers(pDim); @@ -583,7 +583,7 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) { rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.Start, rtl_math_StringFormat_Automatic, - rtl_math_DecimalPlaces_Max, '.', sal_True)); + rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_START, sValue); } if (rGroupInfo.AutoEnd) @@ -593,13 +593,13 @@ void ScXMLExportDataPilot::WriteNumGroupInfo(const ScDPNumGroupInfo& rGroupInfo) rtl::OUStringBuffer sDate; rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.End, rtl_math_StringFormat_Automatic, - rtl_math_DecimalPlaces_Max, '.', sal_True)); + rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_END, sValue); } } rtl::OUString sValue( ::rtl::math::doubleToUString( rGroupInfo.Step, rtl_math_StringFormat_Automatic, - rtl_math_DecimalPlaces_Max, '.', sal_True)); + rtl_math_DecimalPlaces_Max, '.', true)); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STEP, sValue); } @@ -649,7 +649,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const } if (pGroupDim || pNumGroupDim) { - SvXMLElementExport aElemDPGs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUPS, sal_True, sal_True); + SvXMLElementExport aElemDPGs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUPS, true, true); if (pGroupDim) { if (!pGroupDim->GetDatePart()) @@ -661,7 +661,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const if (pGroup) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, pGroup->GetGroupName()); - SvXMLElementExport aElemDPG(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP, sal_True, sal_True); + SvXMLElementExport aElemDPG(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP, true, true); sal_Int32 nElemCount = pGroup->GetElementCount(); for(sal_Int32 j = 0; j < nElemCount; ++j) { @@ -669,7 +669,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const if (pElem) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, *pElem); - SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, sal_True, sal_True); + SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, true, true); } } } @@ -710,7 +710,7 @@ void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDim (sheet::GeneralFunction) pDim->GetFunction() ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sValueStr); - SvXMLElementExport aElemDPF(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, sal_True, sal_True); + SvXMLElementExport aElemDPF(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, true, true); WriteFieldReference(pDim); WriteLevels(pDim); if( pDim->GetOrientation() != sheet::DataPilotFieldOrientation_DATA ) @@ -732,7 +732,7 @@ void ScXMLExportDataPilot::WriteGrandTotal(::xmloff::token::XMLTokenEnum eOrient if (pGrandTotal) rExport.AddAttribute(XML_NAMESPACE_TABLE_EXT, XML_DISPLAY_NAME, *pGrandTotal); - SvXMLElementExport aElemGrandTotal(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL, sal_True, sal_True); + SvXMLElementExport aElemGrandTotal(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL, true, true); } void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreadsheetDocument>& /* xSpreadDoc */) @@ -749,7 +749,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads if (!nDPCount) return; - SvXMLElementExport aElemDPs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES, sal_True, sal_True); + SvXMLElementExport aElemDPs(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES, true, true); rExport.CheckAttrList(); for (size_t i = 0; i < nDPCount; ++i) { @@ -776,15 +776,15 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads { ScAddress aButtonAddr(nCol, nButtonRow, aOutRange.aStart.Tab()); ScRangeStringConverter::GetStringFromAddress( - sOUButtonList, aButtonAddr, pDoc, ::formula::FormulaGrammar::CONV_OOO, ' ', sal_True ); + sOUButtonList, aButtonAddr, pDoc, ::formula::FormulaGrammar::CONV_OOO, ' ', true ); } } pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2); } rtl::OUString sName((*pDPs)[i]->GetName()); rtl::OUString sApplicationData((*pDPs)[i]->GetTag()); - sal_Bool bRowGrand = pDPSave->GetRowGrand(); - sal_Bool bColumnGrand = pDPSave->GetColumnGrand(); + bool bRowGrand = pDPSave->GetRowGrand(); + bool bColumnGrand = pDPSave->GetColumnGrand(); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, sName); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, sApplicationData); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sTargetRangeAddress); @@ -809,7 +809,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads if ((*pDPs)[i]->GetHeaderLayout()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TRUE); - SvXMLElementExport aElemDP(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, sal_True, sal_True); + SvXMLElementExport aElemDP(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, true, true); // grand total elements. @@ -846,7 +846,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads ::formula::FormulaGrammar::CONV_OOO); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, sCellRangeAddress); - SvXMLElementExport aElemSCR(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, sal_True, sal_True); + SvXMLElementExport aElemSCR(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, true, true); rExport.CheckAttrList(); WriteDPFilter(pSheetSource->GetQueryParam()); } @@ -860,7 +860,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, pImpSource->aDBName); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_QUERY_NAME, pImpSource->aObject); - SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, sal_True, sal_True); + SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, true, true); rExport.CheckAttrList(); } break; @@ -868,7 +868,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, pImpSource->aDBName); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_NAME, pImpSource->aObject); - SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, sal_True, sal_True); + SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, true, true); rExport.CheckAttrList(); } break; @@ -878,7 +878,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, pImpSource->aObject); if (!pImpSource->bNative) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TRUE); - SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, sal_True, sal_True); + SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, true, true); rExport.CheckAttrList(); } break; @@ -893,7 +893,7 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USER_NAME, pServSource->aParUser); // #i111754# leave out password attribute as long as DataPilotSource doesn't specify the content // rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PASSWORD, rtl::OUString(pServSource->aParPass)); - SvXMLElementExport aElemSD(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, sal_True, sal_True); + SvXMLElementExport aElemSD(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, true, true); rExport.CheckAttrList(); } WriteDimensions(pDPSave); diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index c1b9426f552d..7fa4eee21f6d 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -49,9 +49,9 @@ class ScXMLExportDataPilot ScXMLExport& rExport; ScDocument* pDoc; - rtl::OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const sal_Bool bUseRegularExpressions, - const sal_Bool bIsString, const double dVal, const String& sVal) const; - void WriteDPCondition(const ScQueryEntry& aQueryEntry, sal_Bool bIsCaseSensitive, sal_Bool bUseRegularExpressions); + rtl::OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions, + const bool bIsString, const double dVal, const String& sVal) const; + void WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions); void WriteDPFilter(const ScQueryParam& aQueryParam); void WriteFieldReference(ScDPSaveDimension* pDim); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index a648ab273200..c7b9f6bde9c1 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -139,7 +139,7 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const uno::Sequence <beans rtl::OUString sConRes; rtl::OUString sSourceObject; sheet::DataImportMode nSourceType = sheet::DataImportMode_NONE; - sal_Bool bNative = false; + bool bNative = false; for (sal_Int16 i = 0; i < nProperties; ++i) { if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_DBNAME))) @@ -161,11 +161,11 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const uno::Sequence <beans if (sDatabaseName.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_QUERY_NAME, sSourceObject); - SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, sal_True, sal_True); + SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, true, true); if (sConRes.getLength()) { rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes ); - SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, sal_True, sal_True); + SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true); } rExport.CheckAttrList(); } @@ -175,11 +175,11 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const uno::Sequence <beans if (sDatabaseName.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_NAME, sSourceObject); - SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, sal_True, sal_True); + SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, true, true); if (sConRes.getLength()) { rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes ); - SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, sal_True, sal_True); + SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true); } rExport.CheckAttrList(); } @@ -191,11 +191,11 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const uno::Sequence <beans rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, sSourceObject); if (!bNative) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TRUE); - SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, sal_True, sal_True); + SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, true, true); if (sConRes.getLength()) { rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes ); - SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, sal_True, sal_True); + SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true); } rExport.CheckAttrList(); } @@ -207,7 +207,7 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const uno::Sequence <beans } } -rtl::OUString ScXMLExportDatabaseRanges::getOperatorXML(const long aFilterOperator, const sal_Bool bUseRegularExpressions) const +rtl::OUString ScXMLExportDatabaseRanges::getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const { switch (aFilterOperator) { @@ -265,7 +265,7 @@ rtl::OUString ScXMLExportDatabaseRanges::getOperatorXML(const long aFilterOperat return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")); } -void ScXMLExportDatabaseRanges::WriteCondition(const sheet::TableFilterField2& aFilterField, sal_Bool bIsCaseSensitive, sal_Bool bUseRegularExpressions) +void ScXMLExportDatabaseRanges::WriteCondition(const sheet::TableFilterField2& aFilterField, bool bIsCaseSensitive, bool bUseRegularExpressions) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(aFilterField.Field)); if (bIsCaseSensitive) @@ -280,7 +280,7 @@ void ScXMLExportDatabaseRanges::WriteCondition(const sheet::TableFilterField2& a else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, aFilterField.StringValue); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, getOperatorXML(aFilterField.Operator, bUseRegularExpressions)); - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, true, true); } void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <sheet::XSheetFilterDescriptor2>& xSheetFilterDescriptor, const rtl::OUString sDatabaseRangeName) @@ -314,22 +314,22 @@ void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <shee if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SKIPDUP))))) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_FALSE); - SvXMLElementExport aElemF(rExport, XML_NAMESPACE_TABLE, XML_FILTER, sal_True, sal_True); + SvXMLElementExport aElemF(rExport, XML_NAMESPACE_TABLE, XML_FILTER, true, true); rExport.CheckAttrList(); - sal_Bool bIsCaseSensitive = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)))); - sal_Bool bUseRegularExpressions = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_USEREGEX)))); - sal_Bool bAnd = false; - sal_Bool bOr = false; + bool bIsCaseSensitive = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)))); + bool bUseRegularExpressions = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_USEREGEX)))); + bool bAnd = false; + bool bOr = false; for (sal_Int32 i = 1; i < nTableFilterFields; ++i) { if (aTableFilterFields[i].Connection == sheet::FilterConnection_AND) - bAnd = sal_True; + bAnd = true; else - bOr = sal_True; + bOr = true; } if (bOr && !bAnd) { - SvXMLElementExport aElemOr(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, sal_True, sal_True); + SvXMLElementExport aElemOr(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, true, true); for (sal_Int32 i = 0; i < nTableFilterFields; ++i) { WriteCondition(aTableFilterFields[i], bIsCaseSensitive, bUseRegularExpressions); @@ -337,7 +337,7 @@ void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <shee } else if (bAnd && !bOr) { - SvXMLElementExport aElemAnd(rExport, XML_NAMESPACE_TABLE, XML_FILTER_AND, sal_True, sal_True); + SvXMLElementExport aElemAnd(rExport, XML_NAMESPACE_TABLE, XML_FILTER_AND, true, true); for (sal_Int32 i = 0; i < nTableFilterFields; ++i) { WriteCondition(aTableFilterFields[i], bIsCaseSensitive, bUseRegularExpressions); @@ -349,15 +349,15 @@ void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <shee } else { - SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, sal_True, sal_True); + SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, true, true); sheet::TableFilterField2 aPrevFilterField = aTableFilterFields[0]; sheet::FilterConnection aConnection = aTableFilterFields[1].Connection; - sal_Bool bOpenAndElement; + bool bOpenAndElement; rtl::OUString aName = rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND)); if (aConnection == sheet::FilterConnection_AND) { - rExport.StartElement( aName, sal_True); - bOpenAndElement = sal_True; + rExport.StartElement( aName, true); + bOpenAndElement = true; } else bOpenAndElement = false; @@ -368,14 +368,14 @@ void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <shee aConnection = aTableFilterFields[i].Connection; if (aTableFilterFields[i].Connection == sheet::FilterConnection_AND) { - rExport.StartElement( aName, sal_True ); - bOpenAndElement = sal_True; + rExport.StartElement( aName, true ); + bOpenAndElement = true; WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions); aPrevFilterField = aTableFilterFields[i]; if (i == nTableFilterFields - 1) { WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions); - rExport.EndElement(aName, sal_True); + rExport.EndElement(aName, true); bOpenAndElement = false; } } @@ -385,7 +385,7 @@ void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <shee aPrevFilterField = aTableFilterFields[i]; if (bOpenAndElement) { - rExport.EndElement(aName, sal_True); + rExport.EndElement(aName, true); bOpenAndElement = false; } if (i == nTableFilterFields - 1) @@ -403,7 +403,7 @@ void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <shee } } if(bOpenAndElement) - rExport.EndElement(aName, sal_True); + rExport.EndElement(aName, true); } } } @@ -412,9 +412,9 @@ void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <shee void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::PropertyValue> aSortProperties) { uno::Sequence <table::TableSortField> aSortFields; - sal_Bool bBindFormatsToContent (sal_True); - sal_Bool bCopyOutputData (false); - sal_Bool bIsUserListEnabled (false); + bool bBindFormatsToContent (true); + bool bCopyOutputData (false); + bool bIsUserListEnabled (false); table::CellAddress aOutputPosition; sal_Int32 nUserListIndex = 0; sal_Int32 nProperties = aSortProperties.getLength(); @@ -449,7 +449,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: if (aSortFields[0].IsCaseSensitive) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); #if OSL_DEBUG_LEVEL > 0 - sal_Bool bCaseSensitive(aSortFields[0].IsCaseSensitive); + bool bCaseSensitive(aSortFields[0].IsCaseSensitive); for (i = 1; i < nSortFields; ++i) { OSL_ENSURE(bCaseSensitive == aSortFields[i].IsCaseSensitive, "seems that it is now possible to have every field case sensitive"); @@ -472,7 +472,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: OSL_ENSURE(sAlgorithm == aSortFields[i].CollatorAlgorithm, "seems that it is now possible to have every field localized"); } #endif - SvXMLElementExport aElemS(rExport, XML_NAMESPACE_TABLE, XML_SORT, sal_True, sal_True); + SvXMLElementExport aElemS(rExport, XML_NAMESPACE_TABLE, XML_SORT, true, true); rExport.CheckAttrList(); for (i = 0; i < nSortFields; ++i) { @@ -500,7 +500,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: } else rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERLIST)) + rtl::OUString::valueOf(nUserListIndex)); - SvXMLElementExport aElemSb(rExport, XML_NAMESPACE_TABLE, XML_SORT_BY, sal_True, sal_True); + SvXMLElementExport aElemSb(rExport, XML_NAMESPACE_TABLE, XML_SORT_BY, true, true); rExport.CheckAttrList(); } } @@ -524,7 +524,7 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE))))) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); } - SvXMLElementExport aElemSTRs(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, sal_True, sal_True); + SvXMLElementExport aElemSTRs(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, true, true); rExport.CheckAttrList(); { ScDBCollection* pDBCollection = pDoc->GetDBCollection(); @@ -541,7 +541,7 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un sUserList += rtl::OUString::valueOf(aSubTotalParam.nUserIndex); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, sUserList); } - SvXMLElementExport aElemSGs(rExport, XML_NAMESPACE_TABLE, XML_SORT_GROUPS, sal_True, sal_True); + SvXMLElementExport aElemSGs(rExport, XML_NAMESPACE_TABLE, XML_SORT_GROUPS, true, true); rExport.CheckAttrList(); } } @@ -552,7 +552,7 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un { sal_Int32 nGroupColumn = xSubTotalField->getGroupColumn(); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, rtl::OUString::valueOf(nGroupColumn)); - SvXMLElementExport aElemSTR(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, sal_True, sal_True); + SvXMLElementExport aElemSTR(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true); rExport.CheckAttrList(); uno::Sequence <sheet::SubTotalColumn> aSubTotalColumns = xSubTotalField->getSubTotalColumns(); sal_Int32 nSubTotalColumns = aSubTotalColumns.getLength(); @@ -562,7 +562,7 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un rtl::OUString sFunction; ScXMLConverter::GetStringFromFunction( sFunction, aSubTotalColumns[j].Function ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction); - SvXMLElementExport aElemSTF(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, sal_True, sal_True); + SvXMLElementExport aElemSTF(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, true, true); rExport.CheckAttrList(); } } @@ -660,7 +660,7 @@ private: mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, aBuf.makeStringAndClear()); } - SvXMLElementExport aElemDR(mrExport, XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, sal_True, sal_True); + SvXMLElementExport aElemDR(mrExport, XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, true, true); writeImport(rData); writeFilter(rData); @@ -1051,7 +1051,7 @@ private: if (aParam.bCaseSens) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); - SvXMLElementExport aElemSTRs(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, sal_True, sal_True); + SvXMLElementExport aElemSTRs(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, true, true); if (aParam.bDoSort) { @@ -1065,7 +1065,7 @@ private: aBuf.append(static_cast<sal_Int32>(aParam.nUserIndex)); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, aBuf.makeStringAndClear()); } - SvXMLElementExport aElemSGs(mrExport, XML_NAMESPACE_TABLE, XML_SORT_GROUPS, sal_True, sal_True); + SvXMLElementExport aElemSGs(mrExport, XML_NAMESPACE_TABLE, XML_SORT_GROUPS, true, true); } for (size_t i = 0; i < MAXSUBTOTAL; ++i) @@ -1076,7 +1076,7 @@ private: sal_Int32 nFieldCol = static_cast<sal_Int32>(aParam.nField[i]); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, rtl::OUString::valueOf(nFieldCol)); - SvXMLElementExport aElemSTR(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, sal_True, sal_True); + SvXMLElementExport aElemSTR(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true); for (SCCOL j = 0, n = aParam.nSubTotals[i]; j < n; ++j) { @@ -1088,7 +1088,7 @@ private: ScXMLConverter::GetStringFromFunction(aFuncStr, eFunc); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, aFuncStr); - SvXMLElementExport aElemSTF(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, sal_True, sal_True); + SvXMLElementExport aElemSTF(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, true, true); } } } @@ -1128,7 +1128,7 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges() // No ranges to export. Bail out. return; - SvXMLElementExport aElemDRs(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_RANGES, sal_True, sal_True); + SvXMLElementExport aElemDRs(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_RANGES, true, true); WriteDatabaseRange func(rExport, pDoc); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx index 835b2f8a32f1..92690d28247a 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx @@ -47,8 +47,8 @@ class ScXMLExportDatabaseRanges ScDocument* pDoc; void WriteImportDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aImportDescriptor); - rtl::OUString getOperatorXML(const long aFilterOperator, const sal_Bool bUseRegularExpressions) const; - void WriteCondition(const com::sun::star::sheet::TableFilterField2& aFilterField, sal_Bool bIsCaseSensitive, sal_Bool bUseRegularExpressions); + rtl::OUString getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const; + void WriteCondition(const com::sun::star::sheet::TableFilterField2& aFilterField, bool bIsCaseSensitive, bool bUseRegularExpressions); void WriteFilterDescriptor(const com::sun::star::uno::Reference <com::sun::star::sheet::XSheetFilterDescriptor2>& xSheetFilterDescriptor, const rtl::OUString sDatabaseRangeName); void WriteSortDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortProperties); void WriteSubTotalDescriptor(const com::sun::star::uno::Reference <com::sun::star::sheet::XSubTotalDescriptor> xSubTotalDescriptor, const rtl::OUString sDatabaseRangeName); diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx index edbba6f2e00f..d578e11d49d7 100644 --- a/sc/source/filter/xml/XMLExportSharedData.cxx +++ b/sc/source/filter/xml/XMLExportSharedData.cxx @@ -90,7 +90,7 @@ void ScMySharedData::AddDrawPage(const ScMyDrawPage& aDrawPage, const sal_Int32 (*pDrawPages)[nTable] = aDrawPage; } -void ScMySharedData::SetDrawPageHasForms(const sal_Int32 nTable, sal_Bool bHasForms) +void ScMySharedData::SetDrawPageHasForms(const sal_Int32 nTable, bool bHasForms) { OSL_ENSURE(pDrawPages, "DrawPages not collected"); if (pDrawPages) @@ -106,14 +106,14 @@ uno::Reference<drawing::XDrawPage> ScMySharedData::GetDrawPage(const sal_Int32 n return uno::Reference<drawing::XDrawPage>(); } -sal_Bool ScMySharedData::HasForm(const sal_Int32 nTable, uno::Reference<drawing::XDrawPage>& xDrawPage) +bool ScMySharedData::HasForm(const sal_Int32 nTable, uno::Reference<drawing::XDrawPage>& xDrawPage) { - sal_Bool bResult(false); + bool bResult(false); if (pDrawPages) { if ((*pDrawPages)[nTable].bHasForms) { - bResult = sal_True; + bResult = true; xDrawPage = (*pDrawPages)[nTable].xDrawPage; } } @@ -133,7 +133,7 @@ void ScMySharedData::SortShapesContainer() pShapesContainer->Sort(); } -sal_Bool ScMySharedData::HasShapes() +bool ScMySharedData::HasShapes() { return ((pShapesContainer && pShapesContainer->HasShapes()) || (pTableShapes && !pTableShapes->empty())); diff --git a/sc/source/filter/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx index 3c131f5925fe..1212a048aa69 100644 --- a/sc/source/filter/xml/XMLExportSharedData.hxx +++ b/sc/source/filter/xml/XMLExportSharedData.hxx @@ -38,7 +38,7 @@ struct ScMyDrawPage { com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> xDrawPage; - sal_Bool bHasForms; + bool bHasForms; ScMyDrawPage() : bHasForms(false) {} }; @@ -71,14 +71,14 @@ public: sal_Int32 GetLastColumn(const sal_Int32 nTable) const; sal_Int32 GetLastRow(const sal_Int32 nTable) const; void AddDrawPage(const ScMyDrawPage& aDrawPage, const sal_Int32 nTable); - void SetDrawPageHasForms(const sal_Int32 nTable, sal_Bool bHasForms); + void SetDrawPageHasForms(const sal_Int32 nTable, bool bHasForms); com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage> GetDrawPage(const sal_Int32 nTable); - sal_Bool HasDrawPage() const { return pDrawPages != NULL; } - sal_Bool HasForm(const sal_Int32 nTable, com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& xDrawPage); + bool HasDrawPage() const { return pDrawPages != NULL; } + bool HasForm(const sal_Int32 nTable, com::sun::star::uno::Reference<com::sun::star::drawing::XDrawPage>& xDrawPage); void AddNewShape(const ScMyShape& aMyShape); void SortShapesContainer(); ScMyShapesContainer* GetShapesContainer() { return pShapesContainer; } - sal_Bool HasShapes(); + bool HasShapes(); void AddTableShape(const sal_Int32 nTable, const com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& xShape); ScMyTableShapes* GetTableShapes() { return pTableShapes; } ScMyDetectiveObjContainer* GetDetectiveObjContainer() { return pDetectiveObjContainer; } diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index dbb99ad511ce..9db5a62e2030 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -309,7 +309,7 @@ ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport) pCurrency(NULL), pPrevCurrency(NULL), nMaxRanges(0), - bPrevRangeAdded(sal_True) + bPrevRangeAdded(true) { } @@ -475,7 +475,7 @@ void ScMyStylesImportHelper::AddRange(const ScRange& rRange) { if (!bPrevRangeAdded) { - sal_Bool bAddRange(false); + bool bAddRange(false); if (nCellType == nPrevCellType && IsEqual(pStyleName, pPrevStyleName) && IsEqual(pCurrency, pPrevCurrency)) @@ -488,7 +488,7 @@ void ScMyStylesImportHelper::AddRange(const ScRange& rRange) aPrevRange.aEnd.SetCol(rRange.aEnd.Col()); } else - bAddRange = sal_True; + bAddRange = true; } else { @@ -499,11 +499,11 @@ void ScMyStylesImportHelper::AddRange(const ScRange& rRange) aPrevRange.aEnd.SetRow(rRange.aEnd.Row()); } else - bAddRange = sal_True; + bAddRange = true; } } else - bAddRange = sal_True; + bAddRange = true; if (bAddRange) { AddRange(); @@ -554,7 +554,7 @@ void ScMyStylesImportHelper::EndTable() if (!bPrevRangeAdded) { AddRange(); - bPrevRangeAdded = sal_True; + bPrevRangeAdded = true; } nMaxRanges = 0; } diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index b7f3e18906aa..2d4eab985498 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -56,7 +56,7 @@ struct ScMyStyleNumberFormat struct LessStyleNumberFormat { - sal_Bool operator() (const ScMyStyleNumberFormat& rValue1, const ScMyStyleNumberFormat& rValue2) const + bool operator() (const ScMyStyleNumberFormat& rValue1, const ScMyStyleNumberFormat& rValue2) const { return rValue1.sStyleName < rValue2.sStyleName; } @@ -86,7 +86,7 @@ struct ScMyCurrencyStyle struct LessCurrencyStyle { - sal_Bool operator() (const ScMyCurrencyStyle& rValue1, const ScMyCurrencyStyle& rValue2) const + bool operator() (const ScMyCurrencyStyle& rValue1, const ScMyCurrencyStyle& rValue2) const { return rValue1.sCurrency < rValue2.sCurrency; } @@ -140,7 +140,7 @@ struct ScMyStyle struct LessStyle { - sal_Bool operator() (const ScMyStyle& rValue1, const ScMyStyle& rValue2) const + bool operator() (const ScMyStyle& rValue1, const ScMyStyle& rValue2) const { return rValue1.sStyleName < rValue2.sStyleName; } @@ -163,14 +163,14 @@ class ScMyStylesImportHelper sal_uInt32 nMaxRanges; sal_Int16 nCellType; sal_Int16 nPrevCellType; - sal_Bool bPrevRangeAdded; + bool bPrevRangeAdded; void ResetAttributes(); ScMyStylesSet::iterator GetIterator(const rtl::OUString* pStyleName); void AddDefaultRange(const ScRange& rRange); void AddSingleRange(const ScRange& rRange); void AddRange(); - sal_Bool IsEqual(const rtl::OUString* pFirst, const rtl::OUString* pSecond) + bool IsEqual(const rtl::OUString* pFirst, const rtl::OUString* pSecond) { return ((pFirst && pSecond && pFirst->equals(*pSecond)) || (!pFirst && !pSecond) || diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 7e21651685e1..12b6bb080ced 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -53,16 +53,16 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, - const Reference < XPropertySet > & rPageStylePropSet, - sal_Bool bFooter, sal_Bool bLft ) : + const Reference < XPropertySet > & rPageStylePropSet, + bool bFooter, bool bLft ) : SvXMLImportContext( rImport, nPrfx, rLName ), xPropSet( rPageStylePropSet ), sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_FTRON)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRON)) ), sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_FTRSHARED)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRSHARED)) ), sContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON)) ), sContentLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTFTRCONT)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTHDRCONT)) ), - bDisplay( sal_True ), - bInsertContent( sal_True ), + bDisplay( true ), + bInsertContent( true ), bLeft( bLft ), bContainsLeft(false), bContainsRight(false), @@ -85,7 +85,7 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, } if( bLeft ) { - sal_Bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn ))); + bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn ))); if( bOn && bDisplay ) { @@ -102,7 +102,7 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, } else { - sal_Bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn ))); + bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn ))); if ( bOn != bDisplay ) xPropSet->setPropertyValue( sOn, uno::makeAny(bDisplay) ); } @@ -136,7 +136,7 @@ SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext( xTextCursor.set(xText->createTextCursor()); xOldTextCursor.set(GetImport().GetTextImport()->GetCursor()); GetImport().GetTextImport()->SetCursor( xTextCursor ); - bContainsCenter = sal_True; + bContainsCenter = true; } } pContext = @@ -155,17 +155,17 @@ SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext( if (IsXMLToken(rLocalName, XML_REGION_LEFT )) { xText.set(xHeaderFooterContent->getLeftText()); - bContainsLeft = sal_True; + bContainsLeft = true; } else if (IsXMLToken(rLocalName, XML_REGION_CENTER )) { xText.set(xHeaderFooterContent->getCenterText()); - bContainsCenter = sal_True; + bContainsCenter = true; } else if (IsXMLToken(rLocalName, XML_REGION_RIGHT )) { xText.set(xHeaderFooterContent->getRightText()); - bContainsRight = sal_True; + bContainsRight = true; } if (xText.is()) { @@ -188,11 +188,11 @@ void XMLTableHeaderFooterContext::EndElement() if( GetImport().GetTextImport()->GetCursor().is() ) { //GetImport().GetTextImport()->GetCursor()->gotoEnd(sal_False); - if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, sal_True ) ) + if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, true ) ) { GetImport().GetTextImport()->GetText()->insertString( GetImport().GetTextImport()->GetCursorAsRange(), sEmpty, - sal_True ); + true ); } GetImport().GetTextImport()->ResetCursor(); } @@ -256,12 +256,12 @@ void XMLHeaderFooterRegionContext::EndElement() if( GetImport().GetTextImport()->GetCursor().is() ) { //GetImport().GetTextImport()->GetCursor()->gotoEnd(sal_False); - if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, sal_True ) ) + if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, true ) ) { OUString sEmpty; GetImport().GetTextImport()->GetText()->insertString( GetImport().GetTextImport()->GetCursorAsRange(), sEmpty, - sal_True ); + true ); } GetImport().GetTextImport()->ResetCursor(); } diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index eecedc746b3e..9863df922769 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -56,12 +56,12 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext const ::rtl::OUString sEmpty; rtl::OUString sCont; - sal_Bool bDisplay; - sal_Bool bInsertContent; - sal_Bool bLeft; - sal_Bool bContainsLeft; - sal_Bool bContainsRight; - sal_Bool bContainsCenter; + bool bDisplay; + bool bInsertContent; + bool bLeft; + bool bContainsLeft; + bool bContainsRight; + bool bContainsCenter; public: TYPEINFO(); @@ -72,7 +72,7 @@ public: ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPageStylePropSet, - sal_Bool bFooter, sal_Bool bLft ); + bool bFooter, bool bLft ); virtual ~XMLTableHeaderFooterContext(); diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 26095fad9893..d0ca14283615 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -233,7 +233,7 @@ ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImpo ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), nShowList(sheet::TableValidationVisibility::UNSORTED), - bAllowEmptyCell(sal_True), + bAllowEmptyCell(true), bDisplayHelp(false), bDisplayError(false) { diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index c350916ad898..b7cd8faa474a 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -60,8 +60,8 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, bSkipDuplicates(false), bCopyOutputData(false), bUseRegularExpressions(false), - bConnectionOr(sal_True), - bNextConnectionOr(sal_True), + bConnectionOr(true), + bNextConnectionOr(true), bConditionSourceRange(false) { ScDocument* pDoc(GetScImport().GetDocument()); @@ -85,7 +85,7 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset )) { ScUnoConversion::FillApiAddress( aOutputPosition, aScRange.aStart ); - bCopyOutputData = sal_True; + bCopyOutputData = true; } } break; @@ -93,7 +93,7 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, { sal_Int32 nOffset(0); if (ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset )) - bConditionSourceRange = sal_True; + bConditionSourceRange = true; } break; case XML_TOK_FILTER_ATTR_CONDITION_SOURCE : @@ -226,7 +226,7 @@ ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport, SvXMLImportContext( rImport, nPrfx, rLName ), pFilterContext(pTempFilterContext) { - pFilterContext->OpenConnection(sal_True); + pFilterContext->OpenConnection(true); } ScXMLOrContext::~ScXMLOrContext() @@ -333,17 +333,17 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } -void ScXMLConditionContext::getOperatorXML(const rtl::OUString sTempOperator, sal_Int32& aFilterOperator, sal_Bool& bUseRegularExpressions) const +void ScXMLConditionContext::getOperatorXML(const rtl::OUString sTempOperator, sal_Int32& aFilterOperator, bool& bUseRegularExpressions) const { bUseRegularExpressions = false; if (IsXMLToken(sTempOperator, XML_MATCH)) { - bUseRegularExpressions = sal_True; + bUseRegularExpressions = true; aFilterOperator = sheet::FilterOperator2::EQUAL; } else if (IsXMLToken(sTempOperator, XML_NOMATCH)) { - bUseRegularExpressions = sal_True; + bUseRegularExpressions = true; aFilterOperator = sheet::FilterOperator2::NOT_EQUAL; } else if (sTempOperator.compareToAscii("=") == 0) @@ -392,14 +392,14 @@ void ScXMLConditionContext::EndElement() else aFilterField.Connection = sheet::FilterConnection_AND; pFilterContext->SetIsCaseSensitive(bIsCaseSensitive); - sal_Bool bUseRegularExpressions; + bool bUseRegularExpressions; getOperatorXML(sOperator, aFilterField.Operator, bUseRegularExpressions); pFilterContext->SetUseRegularExpressions(bUseRegularExpressions); aFilterField.Field = nField; if (IsXMLToken(sDataType, XML_NUMBER)) { aFilterField.NumericValue = sConditionValue.toDouble(); - aFilterField.IsNumeric = sal_True; + aFilterField.IsNumeric = true; } else { @@ -424,8 +424,8 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, bSkipDuplicates(false), bCopyOutputData(false), bUseRegularExpressions(false), - bConnectionOr(sal_True), - bNextConnectionOr(sal_True), + bConnectionOr(true), + bNextConnectionOr(true), bConditionSourceRange(false) { ScDocument* pDoc(GetScImport().GetDocument()); @@ -449,7 +449,7 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset )) { aOutputPosition = aScRange.aStart; - bCopyOutputData = sal_True; + bCopyOutputData = true; } } break; @@ -457,7 +457,7 @@ ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, { sal_Int32 nOffset(0); if(ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset )) - bConditionSourceRange = sal_True; + bConditionSourceRange = true; } break; case XML_TOK_FILTER_ATTR_CONDITION_SOURCE : @@ -539,7 +539,7 @@ void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField) aFilterFields.Resize(nFilterFieldCount + 1); ScQueryEntry& rEntry(aFilterFields.GetEntry(nFilterFieldCount)); rEntry = aFilterField; - rEntry.bDoQuery = sal_True; + rEntry.bDoQuery = true; ++nFilterFieldCount; } @@ -602,7 +602,7 @@ ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport, SvXMLImportContext( rImport, nPrfx, rLName ), pFilterContext(pTempFilterContext) { - pFilterContext->OpenConnection(sal_True); + pFilterContext->OpenConnection(true); } ScXMLDPOrContext::~ScXMLDPOrContext() @@ -709,18 +709,18 @@ SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPre return new SvXMLImportContext( GetImport(), nPrefix, rLName ); } -void ScXMLDPConditionContext::getOperatorXML(const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, sal_Bool& bUseRegularExpressions, +void ScXMLDPConditionContext::getOperatorXML(const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions, double& dVal) const { bUseRegularExpressions = false; if (IsXMLToken(sTempOperator, XML_MATCH)) { - bUseRegularExpressions = sal_True; + bUseRegularExpressions = true; aFilterOperator = SC_EQUAL; } else if (IsXMLToken(sTempOperator, XML_NOMATCH)) { - bUseRegularExpressions = sal_True; + bUseRegularExpressions = true; aFilterOperator = SC_NOT_EQUAL; } else if (sTempOperator.compareToAscii("=") == 0) @@ -757,7 +757,7 @@ void ScXMLDPConditionContext::EndElement() else aFilterField.eConnect = SC_AND; pFilterContext->SetIsCaseSensitive(bIsCaseSensitive); - sal_Bool bUseRegularExpressions; + bool bUseRegularExpressions; double dVal(0.0); getOperatorXML(sOperator, aFilterField.eOp, bUseRegularExpressions, dVal); pFilterContext->SetUseRegularExpressions(bUseRegularExpressions); @@ -776,7 +776,7 @@ void ScXMLDPConditionContext::EndElement() else { aFilterField.pStr = new String(sConditionValue); - aFilterField.bQueryByString = sal_True; + aFilterField.bQueryByString = true; aFilterField.nVal = 0; } pFilterContext->AddFilterField(aFilterField); diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 4d0495ba341f..61838f27d778 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -51,14 +51,14 @@ class ScXMLFilterContext : public SvXMLImportContext com::sun::star::table::CellAddress aOutputPosition; com::sun::star::table::CellRangeAddress aConditionSourceRangeAddress; sal_Int16 nUserListIndex; - sal_Bool bSkipDuplicates; - sal_Bool bCopyOutputData; - sal_Bool bUseRegularExpressions; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; - sal_Bool bConnectionOr; - sal_Bool bNextConnectionOr; - sal_Bool bConditionSourceRange; + bool bSkipDuplicates; + bool bCopyOutputData; + bool bUseRegularExpressions; + bool bIsCaseSensitive; + bool bEnabledUserList; + bool bConnectionOr; + bool bNextConnectionOr; + bool bConditionSourceRange; Stack aConnectionOrStack; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -81,13 +81,13 @@ public: virtual void EndElement(); - void SetIsCaseSensitive(const sal_Bool bTemp) { bIsCaseSensitive = bTemp; } - void SetUseRegularExpressions(const sal_Bool bTemp) { if (!bUseRegularExpressions) bUseRegularExpressions = bTemp;} - void OpenConnection(const sal_Bool bTemp) { sal_Bool* pTemp = new sal_Bool; *pTemp = bConnectionOr; + void SetIsCaseSensitive(const bool bTemp) { bIsCaseSensitive = bTemp; } + void SetUseRegularExpressions(const bool bTemp) { if (!bUseRegularExpressions) bUseRegularExpressions = bTemp;} + void OpenConnection(const bool bTemp) { bool* pTemp = new bool; *pTemp = bConnectionOr; bConnectionOr = bNextConnectionOr; bNextConnectionOr = bTemp; aConnectionOrStack.Push(pTemp);} - void CloseConnection() { sal_Bool* pTemp = static_cast <sal_Bool*> (aConnectionOrStack.Pop()); bConnectionOr = *pTemp; bNextConnectionOr = *pTemp; delete pTemp;} - sal_Bool GetConnection() { sal_Bool bTemp = bConnectionOr; bConnectionOr = bNextConnectionOr; return bTemp; } + void CloseConnection() { bool* pTemp = static_cast <bool*> (aConnectionOrStack.Pop()); bConnectionOr = *pTemp; bNextConnectionOr = *pTemp; delete pTemp;} + bool GetConnection() { bool bTemp = bConnectionOr; bConnectionOr = bNextConnectionOr; return bTemp; } void AddFilterField(const com::sun::star::sheet::TableFilterField2 aFilterField) { aFilterFields.realloc(aFilterFields.getLength() + 1); aFilterFields[aFilterFields.getLength() - 1] = aFilterField; } }; @@ -150,7 +150,7 @@ class ScXMLConditionContext : public SvXMLImportContext rtl::OUString sConditionValue; rtl::OUString sOperator; sal_Int32 nField; - sal_Bool bIsCaseSensitive; + bool bIsCaseSensitive; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -170,7 +170,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - void getOperatorXML(const rtl::OUString sTempOperator, sal_Int32& aFilterOperator, sal_Bool& bUseRegularExpressions) const; + void getOperatorXML(const rtl::OUString sTempOperator, sal_Int32& aFilterOperator, bool& bUseRegularExpressions) const; virtual void EndElement(); }; @@ -185,14 +185,14 @@ class ScXMLDPFilterContext : public SvXMLImportContext ScRange aConditionSourceRangeAddress; sal_uInt8 nFilterFieldCount; sal_Int16 nUserListIndex; - sal_Bool bSkipDuplicates; - sal_Bool bCopyOutputData; - sal_Bool bUseRegularExpressions; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; - sal_Bool bConnectionOr; - sal_Bool bNextConnectionOr; - sal_Bool bConditionSourceRange; + bool bSkipDuplicates; + bool bCopyOutputData; + bool bUseRegularExpressions; + bool bIsCaseSensitive; + bool bEnabledUserList; + bool bConnectionOr; + bool bNextConnectionOr; + bool bConditionSourceRange; Stack aConnectionOrStack; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -215,13 +215,13 @@ public: virtual void EndElement(); - void SetIsCaseSensitive(const sal_Bool bTemp) { bIsCaseSensitive = bTemp; } - void SetUseRegularExpressions(const sal_Bool bTemp) { if (!bUseRegularExpressions) bUseRegularExpressions = bTemp;} - void OpenConnection(const sal_Bool bTemp) { sal_Bool* pTemp = new sal_Bool; *pTemp = bConnectionOr; + void SetIsCaseSensitive(const bool bTemp) { bIsCaseSensitive = bTemp; } + void SetUseRegularExpressions(const bool bTemp) { if (!bUseRegularExpressions) bUseRegularExpressions = bTemp;} + void OpenConnection(const bool bTemp) { bool* pTemp = new bool; *pTemp = bConnectionOr; bConnectionOr = bNextConnectionOr; bNextConnectionOr = bTemp; aConnectionOrStack.Push(pTemp);} - void CloseConnection() { sal_Bool* pTemp = static_cast <sal_Bool*> (aConnectionOrStack.Pop()); bConnectionOr = *pTemp; bNextConnectionOr = *pTemp; delete pTemp;} - sal_Bool GetConnection() { sal_Bool bTemp = bConnectionOr; bConnectionOr = bNextConnectionOr; return bTemp; } + void CloseConnection() { bool* pTemp = static_cast <bool*> (aConnectionOrStack.Pop()); bConnectionOr = *pTemp; bNextConnectionOr = *pTemp; delete pTemp;} + bool GetConnection() { bool bTemp = bConnectionOr; bConnectionOr = bNextConnectionOr; return bTemp; } void AddFilterField (const ScQueryEntry& aFilterField); }; @@ -283,7 +283,7 @@ class ScXMLDPConditionContext : public SvXMLImportContext rtl::OUString sConditionValue; rtl::OUString sOperator; sal_Int32 nField; - sal_Bool bIsCaseSensitive; + bool bIsCaseSensitive; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -303,7 +303,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - void getOperatorXML(const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, sal_Bool& bUseRegularExpressions, + void getOperatorXML(const rtl::OUString sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions, double& dVal) const; virtual void EndElement(); }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index c2ca970dcefc..3c61a1dfd5d6 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -395,7 +395,7 @@ SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix break; case XML_TOK_DOC_AUTOSTYLES: if (GetScImport().getImportFlags() & IMPORT_AUTOSTYLES) - pContext = GetScImport().CreateStylesContext( rLocalName, xAttrList, sal_True); + pContext = GetScImport().CreateStylesContext( rLocalName, xAttrList, true); break; case XML_TOK_DOC_MASTERSTYLES: if (GetScImport().getImportFlags() & IMPORT_MASTERSTYLES) @@ -1758,7 +1758,7 @@ ScXMLImport::ScXMLImport( nProgressCount(0), nStyleFamilyMask( 0 ), nPrevCellType(0), - bLoadDoc( sal_True ), + bLoadDoc( true ), bRemoveLastChar(false), bNullDateSetted(false), bSelfImportingXMLSet(false), @@ -1906,7 +1906,7 @@ SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix } SvXMLImportContext *ScXMLImport::CreateStylesContext(const ::rtl::OUString& rLocalName, - const uno::Reference<xml::sax::XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ) + const uno::Reference<xml::sax::XAttributeList>& xAttrList, bool bIsAutoStyle ) { SvXMLImportContext* pContext = new XMLTableStylesContext( *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, bIsAutoStyle); @@ -2012,11 +2012,11 @@ XMLShapeImportHelper* ScXMLImport::CreateShapeImport() return new XMLTableShapeImportHelper(*this); } -sal_Bool ScXMLImport::GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation) +bool ScXMLImport::GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation) { if (pValidations) { - sal_Bool bFound(false); + bool bFound(false); ScMyImportValidations::iterator aItr(pValidations->begin()); ScMyImportValidations::iterator aEndItr(pValidations->end()); while(aItr != aEndItr && !bFound) @@ -2026,7 +2026,7 @@ sal_Bool ScXMLImport::GetValidation(const rtl::OUString& sName, ScMyImportValida // source position must be set as string, // so sBaseCellAddress no longer has to be converted here - bFound = sal_True; + bFound = true; } else ++aItr; @@ -2066,7 +2066,7 @@ ScXMLChangeTrackingImportHelper* ScXMLImport::GetChangeTrackingImportHelper() void ScXMLImport::InsertStyles() { - GetStyles()->CopyStylesToDoc(sal_True); + GetStyles()->CopyStylesToDoc(true); // if content is going to be loaded with the same import, set bLatinDefaultStyle flag now if ( getImportFlags() & IMPORT_CONTENT ) @@ -2104,7 +2104,7 @@ void ScXMLImport::ExamineDefaultStyle() sal_uInt8 nScript = pDoc->GetStringScriptType( aDecSep ); if ( nScript == 0 || nScript == SCRIPTTYPE_LATIN ) - bLatinDefaultStyle = sal_True; + bLatinDefaultStyle = true; } } } @@ -2328,7 +2328,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri aBuffer.appendAscii("]"); sFormatString = aBuffer.makeStringAndClear(); } - sal_Int32 nNewKey = xLocalNumberFormats->queryKey(sFormatString, aLocale, sal_True); + sal_Int32 nNewKey = xLocalNumberFormats->queryKey(sFormatString, aLocale, true); if (nNewKey == -1) nNewKey = xLocalNumberFormats->addNew(sFormatString, aLocale); return nNewKey; @@ -2351,7 +2351,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri return nKey; } -sal_Bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrentCurrency, const rtl::OUString& sBankSymbol) +bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrentCurrency, const rtl::OUString& sBankSymbol) { uno::Reference <util::XNumberFormatsSupplier> xNumberFormatsSupplier(GetNumberFormatsSupplier()); if (xNumberFormatsSupplier.is()) @@ -2368,7 +2368,7 @@ sal_Bool ScXMLImport::IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl: if ( xNumberPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CURRENCYSYMBOL))) >>= sTemp) { if (sCurrentCurrency.equals(sTemp)) - return sal_True; + return true; // #i61657# This may be a legacy currency symbol that changed in the meantime. if (SvNumberFormatter::GetLegacyOnlyCurrencyEntry( sCurrentCurrency, sBankSymbol) != NULL) return true; @@ -2486,7 +2486,7 @@ void ScXMLImport::SetStyleToRanges() { XMLTableStylesContext *pStyles((XMLTableStylesContext *)GetAutoStyles()); XMLTableStyleContext* pStyle( pStyles ? (XMLTableStyleContext *)pStyles->FindStyleChildContext( - XML_STYLE_FAMILY_TABLE_CELL, sPrevStyleName, sal_True) : NULL ); + XML_STYLE_FAMILY_TABLE_CELL, sPrevStyleName, true) : NULL ); if (pStyle) { pStyle->FillPropertySet(xProperties); @@ -2511,7 +2511,7 @@ void ScXMLImport::SetStyleToRanges() { xProperties->setPropertyValue(sCellStyle, uno::makeAny(GetStyleDisplayName( XML_STYLE_FAMILY_TABLE_CELL, sPrevStyleName ))); sal_Int32 nNumberFormat(GetStyleNumberFormats()->GetStyleNumberFormat(sPrevStyleName)); - sal_Bool bInsert(nNumberFormat == -1); + bool bInsert(nNumberFormat == -1); SetType(xProperties, nNumberFormat, nPrevCellType, sPrevCurrency); if (bInsert) GetStyleNumberFormats()->AddStyleNumberFormat(sPrevStyleName, nNumberFormat); @@ -2569,7 +2569,7 @@ void ScXMLImport::SetStyleToRange(const ScRange& rRange, const rtl::OUString* pS AddStyleRange(aCellRange); } -sal_Bool ScXMLImport::SetNullDateOnUnitConverter() +bool ScXMLImport::SetNullDateOnUnitConverter() { if (!bNullDateSetted) bNullDateSetted = GetMM100UnitConverter().setNullDate(GetModel()); @@ -2649,7 +2649,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE if (pDoc && !pDoc->IsImportingXML()) { ScModelObj::getImplementation(GetModel())->BeforeXMLLoading(); - bSelfImportingXMLSet = sal_True; + bSelfImportingXMLSet = true; } // if content and styles are loaded with separate imports, @@ -2908,7 +2908,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; ++nTab) if (!pSheetData->IsSheetBlocked( nTab )) - pDoc->SetStreamValid( nTab, sal_True ); + pDoc->SetStreamValid( nTab, true ); } aTables.UpdateRowHeights(); @@ -2924,7 +2924,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE if (pDoc && bSelfImportingXMLSet) { - ScModelObj::getImplementation(GetModel())->AfterXMLLoading(sal_True); + ScModelObj::getImplementation(GetModel())->AfterXMLLoading(true); } } @@ -2999,7 +2999,7 @@ void ScXMLImport::SetRangeOverflowType(sal_uInt32 nType) pDoc->SetRangeOverflowType( nType ); } -void ScXMLImport::ProgressBarIncrement(sal_Bool bEditCell, sal_Int32 nInc) +void ScXMLImport::ProgressBarIncrement(bool bEditCell, sal_Int32 nInc) { nProgressCount += nInc; if (bEditCell || nProgressCount > 100) diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 09d226ca4555..c2f755121c4c 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -631,7 +631,7 @@ struct ScMyNamedExpression rtl::OUString sBaseCellAddress; rtl::OUString sRangeType; formula::FormulaGrammar::Grammar eGrammar; - sal_Bool bIsExpression; + bool bIsExpression; }; typedef ::boost::ptr_list<ScMyNamedExpression> ScMyNamedExpressions; @@ -640,7 +640,7 @@ struct ScMyLabelRange { rtl::OUString sLabelRangeStr; rtl::OUString sDataRangeStr; - sal_Bool bColumnOrientation; + bool bColumnOrientation; }; typedef std::list<const ScMyLabelRange*> ScMyLabelRanges; @@ -663,9 +663,9 @@ struct ScMyImportValidation formula::FormulaGrammar::Grammar eGrammar1; formula::FormulaGrammar::Grammar eGrammar2; sal_Int16 nShowList; - sal_Bool bShowErrorMessage; - sal_Bool bShowImputMessage; - sal_Bool bIgnoreBlanks; + bool bShowErrorMessage; + bool bShowImputMessage; + bool bIgnoreBlanks; }; typedef std::vector<ScMyImportValidation> ScMyImportValidations; @@ -788,12 +788,12 @@ class ScXMLImport: public SvXMLImport sal_Int32 nProgressCount; sal_uInt16 nStyleFamilyMask;// Mask of styles to load sal_Int16 nPrevCellType; - sal_Bool bLoadDoc; // Load doc or styles only - sal_Bool bRemoveLastChar; - sal_Bool bNullDateSetted; - sal_Bool bSelfImportingXMLSet; - sal_Bool bLatinDefaultStyle; // latin-only number format in default style? - sal_Bool bFromWrapper; // called from ScDocShell / ScXMLImportWrapper? + bool bLoadDoc; // Load doc or styles only + bool bRemoveLastChar; + bool bNullDateSetted; + bool bSelfImportingXMLSet; + bool bLatinDefaultStyle; // latin-only number format in default style? + bool bFromWrapper; // called from ScDocShell / ScXMLImportWrapper? protected: @@ -824,7 +824,7 @@ public: SvXMLImportContext *CreateScriptContext( const ::rtl::OUString& rLocalName ); SvXMLImportContext *CreateStylesContext(const ::rtl::OUString& rLocalName, - const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, sal_Bool bAutoStyles ); + const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, bool bAutoStyles ); SvXMLImportContext *CreateBodyContext( const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -838,9 +838,9 @@ public: ScMyTables& GetTables() { return aTables; } sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; } - sal_Bool IsStylesOnlyMode() const { return !bLoadDoc; } + bool IsStylesOnlyMode() const { return !bLoadDoc; } - sal_Bool IsLatinDefaultStyle() const { return bLatinDefaultStyle; } + bool IsLatinDefaultStyle() const { return bLatinDefaultStyle; } sal_Int16 GetCellType(const ::rtl::OUString& rStrValue) const; @@ -935,15 +935,15 @@ public: if (!pValidations) pValidations = new ScMyImportValidations(); pValidations->push_back(rValidation); } - sal_Bool GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation); + bool GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation); inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { if (!pDetectiveOpArray) pDetectiveOpArray = new ScMyImpDetectiveOpArray(); return pDetectiveOpArray; } - void SetRemoveLastChar(sal_Bool bValue) { bRemoveLastChar = bValue; } - sal_Bool GetRemoveLastChar() { return bRemoveLastChar; } + void SetRemoveLastChar(bool bValue) { bRemoveLastChar = bValue; } + bool GetRemoveLastChar() { return bRemoveLastChar; } ScXMLChangeTrackingImportHelper* GetChangeTrackingImportHelper(); void AddViewContext(SvXMLImportContext* pContext) { aViewContextList.push_back(pContext); } @@ -957,13 +957,13 @@ public: std::vector<rtl::OUString> GetTableStyle() { return aTableStyles; } ScMyStylesImportHelper* GetStylesImportHelper() { return pStylesImportHelper; } sal_Int32 SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUString& rCurrency); - sal_Bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrencySymbol, const rtl::OUString& sBankSymbol); + bool IsCurrencySymbol(const sal_Int32 nNumberFormat, const rtl::OUString& sCurrencySymbol, const rtl::OUString& sBankSymbol); void SetType(com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet>& rProperties, sal_Int32& rNumberFormat, const sal_Int16 nCellType, const rtl::OUString& rCurrency); - void ProgressBarIncrement(sal_Bool bEditCell, sal_Int32 nInc = 1); + void ProgressBarIncrement(bool bEditCell, sal_Int32 nInc = 1); private: void AddStyleRange(const com::sun::star::table::CellRangeAddress& rCellRange); @@ -973,7 +973,7 @@ private: public: void SetStyleToRange(const ScRange& rRange, const rtl::OUString* pStyleName, const sal_Int16 nCellType, const rtl::OUString* pCurrency); - sal_Bool SetNullDateOnUnitConverter(); + bool SetNullDateOnUnitConverter(); XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper(); ScMyStyleNumberFormats* GetStyleNumberFormats(); @@ -1043,7 +1043,7 @@ public: The value of the processed formula attribute. @param bRestrictToExternalNmsp - If set to sal_True, only namespaces of external formula grammars will + If set to true, only namespaces of external formula grammars will be recognized. Internal namespace prefixes (e.g. 'oooc:' or 'of:' will be considered to be part of the formula, e.g. an expression with range operator. diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 7e325b93eb3c..2488eaa29b6d 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -66,7 +66,7 @@ class ScXMLLabelRangeContext : public SvXMLImportContext private: ::rtl::OUString sLabelRangeStr; ::rtl::OUString sDataRangeStr; - sal_Bool bColumnOrientation; + bool bColumnOrientation; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index 9e8239aaf310..8ccafbe26346 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -222,7 +222,7 @@ ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( break; } } - pNamedExpression->bIsExpression = sal_True; + pNamedExpression->bIsExpression = true; mpInserter->insert(pNamedExpression); } diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index 97b5ab7f939d..5a36e10e4065 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -61,10 +61,10 @@ ScXMLTableScenarioContext::ScXMLTableScenarioContext( const uno::Reference< xml::sax::XAttributeList >& xAttrList ): SvXMLImportContext( rImport, nPrfx, rLName ), aBorderColor( COL_BLACK ), - bDisplayBorder( sal_True ), - bCopyBack( sal_True ), - bCopyStyles( sal_True ), - bCopyFormulas( sal_True ), + bDisplayBorder( true ), + bCopyBack( true ), + bCopyStyles( true ), + bCopyFormulas( true ), bIsActive( false ), bProtected( false ) { @@ -150,7 +150,7 @@ void ScXMLTableScenarioContext::EndElement() ScDocument* pDoc(GetScImport().GetDocument()); if (pDoc) { - pDoc->SetScenario( nCurrTable, sal_True ); + pDoc->SetScenario( nCurrTable, true ); sal_uInt16 nFlags( 0 ); if( bDisplayBorder ) nFlags |= SC_SCENARIO_SHOWFRAME; diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index f6dd8d74b09b..ffd1faf1d8be 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -41,12 +41,12 @@ private: rtl::OUString sComment; Color aBorderColor; ScRangeList aScenarioRanges; - sal_Bool bDisplayBorder; - sal_Bool bCopyBack; - sal_Bool bCopyStyles; - sal_Bool bCopyFormulas; - sal_Bool bIsActive; - sal_Bool bProtected; + bool bDisplayBorder; + bool bCopyBack; + bool bCopyStyles; + bool bCopyFormulas; + bool bIsActive; + bool bProtected; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index 0826b58313b1..b5f94864004b 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -66,7 +66,7 @@ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sAlgorithm(), nUserListIndex(0), bCopyOutputData(false), - bBindFormatsToContent(sal_True), + bBindFormatsToContent(true), bIsCaseSensitive(false), bEnabledUserList(false) { @@ -94,7 +94,7 @@ ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset )) { ScUnoConversion::FillApiAddress( aOutputPosition, aScRange.aStart ); - bCopyOutputData = sal_True; + bCopyOutputData = true; } } break; @@ -190,7 +190,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl util::SortField aSortField; aSortField.Field = sFieldNumber.toInt32(); if (IsXMLToken(sOrder, XML_ASCENDING)) - aSortField.SortAscending = sal_True; + aSortField.SortAscending = true; else aSortField.SortAscending = false; if (sDataType.getLength() > 8) @@ -198,7 +198,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl rtl::OUString sTemp = sDataType.copy(0, 8); if (sTemp.compareToAscii(SC_USERLIST) == 0) { - bEnabledUserList = sal_True; + bEnabledUserList = true; sTemp = sDataType.copy(8); nUserListIndex = static_cast<sal_Int16>(sTemp.toInt32()); } diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 7ccc82053905..8522ea9b1016 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -47,10 +47,10 @@ class ScXMLSortContext : public SvXMLImportContext rtl::OUString sLanguage; rtl::OUString sAlgorithm; sal_Int16 nUserListIndex; - sal_Bool bCopyOutputData; - sal_Bool bBindFormatsToContent; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; + bool bCopyOutputData; + bool bBindFormatsToContent; + bool bIsCaseSensitive; + bool bEnabledUserList; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 487d484a259a..af4e6b9d5d9f 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -469,7 +469,7 @@ TYPEINIT1( XMLTableStyleContext, XMLPropStyleContext ); XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList > & xAttrList, - SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) : + SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) : XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), sDataStyleName(), sNumberFormat(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"))), @@ -686,7 +686,7 @@ XMLTableStylesContext::XMLTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , const OUString& rLName , const uno::Reference< XAttributeList > & xAttrList, - const sal_Bool bTempAutoStyles ) : + const bool bTempAutoStyles ) : SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ), sCellStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CellStyle" ) )), sColumnStyleServiceName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))), @@ -966,7 +966,7 @@ TYPEINIT1( ScMasterPageContext, XMLTextMasterPageContext ); ScMasterPageContext::ScMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList > & xAttrList, - sal_Bool bOverwrite ) : + bool bOverwrite ) : XMLTextMasterPageContext( rImport, nPrfx, rLName, xAttrList, bOverwrite ), bContainsRightHeader(false), bContainsRightFooter(false) diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 7c00d587031b..6f44d6a4a5c2 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -103,8 +103,8 @@ class XMLTableStyleContext : public XMLPropStyleContext com::sun::star::uno::Any aConditionalFormat; sal_Int32 nNumberFormat; SCTAB nLastSheet; - sal_Bool bConditionalFormatCreated; - sal_Bool bParentSet; + bool bConditionalFormatCreated; + bool bParentSet; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -142,7 +142,7 @@ public: XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = false ); + SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~XMLTableStyleContext(); virtual SvXMLImportContext *CreateChildContext( @@ -185,7 +185,7 @@ class XMLTableStylesContext : public SvXMLStylesContext sal_Int32 nConditionalFormatIndex; sal_Int32 nCellStyleIndex; sal_Int32 nMasterPageNameIndex; - sal_Bool bAutoStyles; + bool bAutoStyles; UniReference < SvXMLImportPropertyMapper > xCellImpPropMapper; UniReference < SvXMLImportPropertyMapper > xColumnImpPropMapper; @@ -217,7 +217,7 @@ public: XMLTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , const ::rtl::OUString& rLName , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const sal_Bool bAutoStyles ); + const bool bAutoStyles ); virtual ~XMLTableStylesContext(); // Create child element. @@ -285,7 +285,7 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - sal_Bool bOverwrite ); + bool bOverwrite ); virtual ~ScMasterPageContext(); virtual SvXMLImportContext *CreateChildContext( |