From ddb07081da099a392b1cdcbb8716afb6af43e006 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 27 Mar 2014 17:24:01 +0200 Subject: xmloff: sal_Bool->bool Change-Id: I1deb10cb1581137ab92e73367e63339822a9a094 --- xmloff/source/script/XMLEventExport.cxx | 24 ++++++++++++------------ xmloff/source/script/XMLEventsImportContext.cxx | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'xmloff/source/script') diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 6a303e6189ab..a27927c082af 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -93,7 +93,7 @@ void XMLEventExport::AddTranslationTable( } void XMLEventExport::Export( Reference & rSupplier, - sal_Bool bWhitespace) + bool bWhitespace) { if (rSupplier.is()) { @@ -104,14 +104,14 @@ void XMLEventExport::Export( Reference & rSupplier, } void XMLEventExport::Export( Reference & rReplace, - sal_Bool bWhitespace) + bool bWhitespace) { Reference xAccess(rReplace, UNO_QUERY); Export(xAccess, bWhitespace); } void XMLEventExport::Export( Reference & rAccess, - sal_Bool bWhitespace) + bool bWhitespace) { // early out if we don't actually get any events if (!rAccess.is()) @@ -120,7 +120,7 @@ void XMLEventExport::Export( Reference & rAccess, } // have we already processed an element? - sal_Bool bStarted = sal_False; + bool bStarted = false; // iterate over all event types Sequence aNames = rAccess->getElementNames(); @@ -160,7 +160,7 @@ void XMLEventExport::Export( Reference & rAccess, } void XMLEventExport::ExportExt( Reference & rAccess, - sal_Bool bWhitespace ) + bool bWhitespace ) { // set bExtNamespace flag to use XML_NAMESPACE_OFFICE_EXT namespace // for events element (not for child elements) @@ -173,7 +173,7 @@ void XMLEventExport::ExportExt( Reference & rAccess, void XMLEventExport::ExportSingleEvent( Sequence& rEventValues, const OUString& rApiEventName, - sal_Bool bUseWhitespace ) + bool bUseWhitespace ) { // translate the name NameMap::iterator aIter = aNameTranslationMap.find(rApiEventName); @@ -182,7 +182,7 @@ void XMLEventExport::ExportSingleEvent( const XMLEventName& rXmlName = aIter->second; // export the event ... - sal_Bool bStarted = sal_False; + bool bStarted = false; ExportEvent( rEventValues, rXmlName, bUseWhitespace, bStarted ); // ... and close the container element (if necessary) @@ -207,8 +207,8 @@ void XMLEventExport::ExportSingleEvent( void XMLEventExport::ExportEvent( Sequence& rEventValues, const XMLEventName& rXmlEventName, - sal_Bool bUseWhitespace, - sal_Bool& rExported ) + bool bUseWhitespace, + bool& rExported ) { // search for EventType value and then delegate to EventHandler sal_Int32 nValues = rEventValues.getLength(); @@ -228,7 +228,7 @@ void XMLEventExport::ExportEvent( { // OK, we have't yet exported the enclosing // element. So we do that now. - rExported = sal_True; + rExported = true; StartElement(bUseWhitespace); } @@ -258,7 +258,7 @@ void XMLEventExport::ExportEvent( } -void XMLEventExport::StartElement(sal_Bool bWhitespace) +void XMLEventExport::StartElement(bool bWhitespace) { if (bWhitespace) { @@ -270,7 +270,7 @@ void XMLEventExport::StartElement(sal_Bool bWhitespace) bWhitespace); } -void XMLEventExport::EndElement(sal_Bool bWhitespace) +void XMLEventExport::EndElement(bool bWhitespace) { sal_uInt16 nNamespace = bExtNamespace ? XML_NAMESPACE_OFFICE_EXT : XML_NAMESPACE_OFFICE; diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx index de2a8c1f8a3e..e6edda892421 100644 --- a/xmloff/source/script/XMLEventsImportContext.cxx +++ b/xmloff/source/script/XMLEventsImportContext.cxx @@ -158,7 +158,7 @@ void XMLEventsImportContext::SetEvents( } } -sal_Bool XMLEventsImportContext::GetEventSequence( +bool XMLEventsImportContext::GetEventSequence( const OUString& rName, Sequence & rSequence ) { @@ -174,7 +174,7 @@ sal_Bool XMLEventsImportContext::GetEventSequence( } // if we're not at the end, set the sequence - sal_Bool bRet = (aIter != aCollectEvents.end()); + bool bRet = (aIter != aCollectEvents.end()); if (bRet) rSequence = aIter->second; -- cgit