Kaydet (Commit) 59f1e330 authored tarafından Matúš Kukan's avatar Matúš Kukan

Use plain bool parameter here

Change-Id: Ic948889a0fac32adc48a7a4fb1e7f82ce8b08ba4
üst 552b5e1f
...@@ -224,7 +224,7 @@ public: ...@@ -224,7 +224,7 @@ public:
Entity& getEntity() { return *mpTop; } Entity& getEntity() { return *mpTop; }
const Entity& getEntity() const { return *mpTop; } const Entity& getEntity() const { return *mpTop; }
void parse(); void parse();
void produce( CallbackType aType ); void produce( bool bForceFlush = false );
bool hasNamespaceURL( const OUString& rPrefix ) const; bool hasNamespaceURL( const OUString& rPrefix ) const;
...@@ -276,7 +276,7 @@ private: ...@@ -276,7 +276,7 @@ private:
{ {
Entity &rEntity = mpParser->getEntity(); Entity &rEntity = mpParser->getEntity();
rEntity.getEvent( EXCEPTION ); rEntity.getEvent( EXCEPTION );
mpParser->produce( EXCEPTION ); mpParser->produce( true );
} }
} }
}; };
...@@ -947,11 +947,10 @@ void FastSaxParserImpl::deleteUsedEvents() ...@@ -947,11 +947,10 @@ void FastSaxParserImpl::deleteUsedEvents()
} }
} }
void FastSaxParserImpl::produce( CallbackType aType ) void FastSaxParserImpl::produce( bool bForceFlush )
{ {
Entity& rEntity = getEntity(); Entity& rEntity = getEntity();
if (aType == DONE || if (bForceFlush ||
aType == EXCEPTION ||
rEntity.mnProducedEventsSize == rEntity.mnEventListSize) rEntity.mnProducedEventsSize == rEntity.mnEventListSize)
{ {
osl::ResettableMutexGuard aGuard(rEntity.maEventProtector); osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
...@@ -1063,7 +1062,7 @@ void FastSaxParserImpl::parse() ...@@ -1063,7 +1062,7 @@ void FastSaxParserImpl::parse()
while( nRead > 0 ); while( nRead > 0 );
rEntity.getEvent( DONE ); rEntity.getEvent( DONE );
if( rEntity.mbEnableThreads ) if( rEntity.mbEnableThreads )
produce( DONE ); produce( true );
} }
// The C-Callbacks // The C-Callbacks
...@@ -1186,7 +1185,7 @@ void FastSaxParserImpl::callbackStartElement( const XML_Char* pwName, const XML_ ...@@ -1186,7 +1185,7 @@ void FastSaxParserImpl::callbackStartElement( const XML_Char* pwName, const XML_
rEntity.maNamespaceStack.push( NameWithToken(rEvent.msNamespace, nNamespaceToken) ); rEntity.maNamespaceStack.push( NameWithToken(rEvent.msNamespace, nNamespaceToken) );
if (rEntity.mbEnableThreads) if (rEntity.mbEnableThreads)
produce( START_ELEMENT ); produce();
else else
rEntity.startElement( &rEvent ); rEntity.startElement( &rEvent );
} }
...@@ -1209,7 +1208,7 @@ void FastSaxParserImpl::callbackEndElement( SAL_UNUSED_PARAMETER const XML_Char* ...@@ -1209,7 +1208,7 @@ void FastSaxParserImpl::callbackEndElement( SAL_UNUSED_PARAMETER const XML_Char*
rEntity.getEvent( END_ELEMENT ); rEntity.getEvent( END_ELEMENT );
if (rEntity.mbEnableThreads) if (rEntity.mbEnableThreads)
produce( END_ELEMENT ); produce();
else else
rEntity.endElement(); rEntity.endElement();
} }
...@@ -1220,7 +1219,7 @@ void FastSaxParserImpl::callbackCharacters( const XML_Char* s, int nLen ) ...@@ -1220,7 +1219,7 @@ void FastSaxParserImpl::callbackCharacters( const XML_Char* s, int nLen )
Event& rEvent = rEntity.getEvent( CHARACTERS ); Event& rEvent = rEntity.getEvent( CHARACTERS );
rEvent.msChars = OUString(s, nLen, RTL_TEXTENCODING_UTF8); rEvent.msChars = OUString(s, nLen, RTL_TEXTENCODING_UTF8);
if (rEntity.mbEnableThreads) if (rEntity.mbEnableThreads)
produce( CHARACTERS ); produce();
else else
rEntity.characters( rEvent.msChars ); rEntity.characters( rEvent.msChars );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment