summaryrefslogtreecommitdiff
path: root/sax
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-10-17 22:56:58 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-10-17 22:56:58 +0200
commit94f99a6baeb27af70f4aa74e74a3090d50f24470 (patch)
tree82aecd3f7b9e691c155a8f713bca5332e6fbe306 /sax
parentdd35d93d81580334277418f2d7bbc2b0a132a16e (diff)
sax: build fix: don't prefix enum values
Change-Id: I6f4eac6103821227bc72de8c3bb0fb89a7a8bc9d
Diffstat (limited to 'sax')
-rw-r--r--sax/source/fastparser/fastparser.cxx34
1 files changed, 17 insertions, 17 deletions
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index d7635d9c22b9..fa8990da6627 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -76,8 +76,8 @@ private:
}
catch (const SAXParseException& e)
{
- mpParser->getEntity().getEvent( CallbackType::EXCEPTION );
- mpParser->produce( CallbackType::EXCEPTION );
+ mpParser->getEntity().getEvent( EXCEPTION );
+ mpParser->produce( EXCEPTION );
}
}
};
@@ -798,8 +798,8 @@ void FastSaxParser::deleteUsedEvents()
void FastSaxParser::produce( CallbackType aType )
{
Entity& rEntity = getEntity();
- if (aType == CallbackType::DONE ||
- aType == CallbackType::EXCEPTION ||
+ if (aType == DONE ||
+ aType == EXCEPTION ||
rEntity.mnProducedEventsSize == rEntity.mnEventListSize)
{
osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
@@ -829,18 +829,18 @@ bool FastSaxParser::consume(EventList *pEventList)
{
switch ((*aEventIt).maType)
{
- case CallbackType::START_ELEMENT:
+ case START_ELEMENT:
rEntity.startElement( &(*aEventIt) );
break;
- case CallbackType::END_ELEMENT:
+ case END_ELEMENT:
rEntity.endElement();
break;
- case CallbackType::CHARACTERS:
+ case CHARACTERS:
rEntity.characters( (*aEventIt).msChars );
break;
- case CallbackType::DONE:
+ case DONE:
return false;
- case CallbackType::EXCEPTION:
+ case EXCEPTION:
{
assert( rEntity.maSavedException.hasValue() );
// Error during parsing !
@@ -918,9 +918,9 @@ void FastSaxParser::parse()
}
}
while( nRead > 0 );
- rEntity.getEvent( CallbackType::DONE );
+ rEntity.getEvent( DONE );
if (rEntity.mbEnableThreads)
- produce( CallbackType::DONE );
+ produce( DONE );
}
//------------------------------------------
@@ -943,7 +943,7 @@ void FastSaxParser::callbackStartElement( const XML_Char* pwName, const XML_Char
}
// create attribute map and process namespace instructions
- Event& rEvent = getEntity().getEvent( CallbackType::START_ELEMENT );
+ Event& rEvent = getEntity().getEvent( START_ELEMENT );
if (rEvent.mxAttributes.is())
rEvent.mxAttributes->clear();
else
@@ -1038,7 +1038,7 @@ void FastSaxParser::callbackStartElement( const XML_Char* pwName, const XML_Char
rEntity.maNamespaceStack.push( NameWithToken(rEvent.msNamespace, nNamespaceToken) );
rEvent.msElementName = OUString(pName, nNameLen, RTL_TEXTENCODING_UTF8);
if (rEntity.mbEnableThreads)
- produce( CallbackType::START_ELEMENT );
+ produce( START_ELEMENT );
else
rEntity.startElement( &rEvent );
}
@@ -1059,9 +1059,9 @@ void FastSaxParser::callbackEndElement( SAL_UNUSED_PARAMETER const XML_Char* )
if( !rEntity.maNamespaceStack.empty() )
rEntity.maNamespaceStack.pop();
- rEntity.getEvent( CallbackType::END_ELEMENT );
+ rEntity.getEvent( END_ELEMENT );
if (rEntity.mbEnableThreads)
- produce( CallbackType::END_ELEMENT );
+ produce( END_ELEMENT );
else
rEntity.endElement();
}
@@ -1070,10 +1070,10 @@ void FastSaxParser::callbackEndElement( SAL_UNUSED_PARAMETER const XML_Char* )
void FastSaxParser::callbackCharacters( const XML_Char* s, int nLen )
{
Entity& rEntity = getEntity();
- Event& rEvent = rEntity.getEvent( CallbackType::CHARACTERS );
+ Event& rEvent = rEntity.getEvent( CHARACTERS );
rEvent.msChars = OUString(s, nLen, RTL_TEXTENCODING_UTF8);
if (rEntity.mbEnableThreads)
- produce( CallbackType::CHARACTERS );
+ produce( CHARACTERS );
else
rEntity.characters( rEvent.msChars );
}