summaryrefslogtreecommitdiff
path: root/sax
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-08-26 15:03:24 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2014-08-30 09:20:44 +0200
commit59f1e330f0ecbb7d2387c1569c19fd055c162f8f (patch)
tree4b16091b4d306464cbef7e6b464caa6b3686ad17 /sax
parent552b5e1f230fbbf49f3624d3bc31cab32898b16c (diff)
Use plain bool parameter here
Change-Id: Ic948889a0fac32adc48a7a4fb1e7f82ce8b08ba4
Diffstat (limited to 'sax')
-rw-r--r--sax/source/fastparser/fastparser.cxx17
1 files changed, 8 insertions, 9 deletions
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 1e08851313cd..37b513356a99 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -224,7 +224,7 @@ public:
Entity& getEntity() { return *mpTop; }
const Entity& getEntity() const { return *mpTop; }
void parse();
- void produce( CallbackType aType );
+ void produce( bool bForceFlush = false );
bool hasNamespaceURL( const OUString& rPrefix ) const;
@@ -276,7 +276,7 @@ private:
{
Entity &rEntity = mpParser->getEntity();
rEntity.getEvent( EXCEPTION );
- mpParser->produce( EXCEPTION );
+ mpParser->produce( true );
}
}
};
@@ -947,11 +947,10 @@ void FastSaxParserImpl::deleteUsedEvents()
}
}
-void FastSaxParserImpl::produce( CallbackType aType )
+void FastSaxParserImpl::produce( bool bForceFlush )
{
Entity& rEntity = getEntity();
- if (aType == DONE ||
- aType == EXCEPTION ||
+ if (bForceFlush ||
rEntity.mnProducedEventsSize == rEntity.mnEventListSize)
{
osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
@@ -1063,7 +1062,7 @@ void FastSaxParserImpl::parse()
while( nRead > 0 );
rEntity.getEvent( DONE );
if( rEntity.mbEnableThreads )
- produce( DONE );
+ produce( true );
}
// The C-Callbacks
@@ -1186,7 +1185,7 @@ void FastSaxParserImpl::callbackStartElement( const XML_Char* pwName, const XML_
rEntity.maNamespaceStack.push( NameWithToken(rEvent.msNamespace, nNamespaceToken) );
if (rEntity.mbEnableThreads)
- produce( START_ELEMENT );
+ produce();
else
rEntity.startElement( &rEvent );
}
@@ -1209,7 +1208,7 @@ void FastSaxParserImpl::callbackEndElement( SAL_UNUSED_PARAMETER const XML_Char*
rEntity.getEvent( END_ELEMENT );
if (rEntity.mbEnableThreads)
- produce( END_ELEMENT );
+ produce();
else
rEntity.endElement();
}
@@ -1220,7 +1219,7 @@ void FastSaxParserImpl::callbackCharacters( const XML_Char* s, int nLen )
Event& rEvent = rEntity.getEvent( CHARACTERS );
rEvent.msChars = OUString(s, nLen, RTL_TEXTENCODING_UTF8);
if (rEntity.mbEnableThreads)
- produce( CHARACTERS );
+ produce();
else
rEntity.characters( rEvent.msChars );
}