diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-11 17:01:47 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 15:50:21 +0200 |
commit | ec9b2600293f4910937e6e49c96c2797c9664abc (patch) | |
tree | 746c894189fbb62233fab76db61bdfe7feebf577 /xmlsecurity/source/framework | |
parent | 8a36e1a3d9ce23bca2f52bef86b837796b944d7a (diff) |
Remove unused _USECOMPRESSEDDOCUMENTHANDLER
...introduced with 9f34fde7a8750b856570b5e855d2ecb226bf0c23 "libxmlsec" but
always unconditionally defined. Fix some indentation.
Change-Id: Ib46d4d7153d84975e9bcd8351779634f8d43240c
Diffstat (limited to 'xmlsecurity/source/framework')
-rw-r--r-- | xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 768eb6608287..9bc7cbeaa2df 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -34,8 +34,6 @@ namespace cssxs = com::sun::star::xml::sax; #define IMPLEMENTATION_NAME "com.sun.star.xml.security.framework.SAXEventKeeperImpl" -#define _USECOMPRESSEDDOCUMENTHANDLER - SAXEventKeeperImpl::SAXEventKeeperImpl( ) :m_pRootBufferNode(nullptr), m_pCurrentBufferNode(nullptr), @@ -1099,15 +1097,11 @@ void SAL_CALL SAXEventKeeperImpl::startElement( { m_xNextHandler->startElement(aName, xAttribs); } - /* * If not forwarding, buffer this startElement. */ if (!m_bIsForwarding) { - #ifndef _USECOMPRESSEDDOCUMENTHANDLER - m_xDocumentHandler->startElement(aName, xAttribs); - #else sal_Int32 nLength = xAttribs->getLength(); cssu::Sequence< cssxcsax::XMLAttribute > aAttributes (nLength); @@ -1118,8 +1112,6 @@ void SAL_CALL SAXEventKeeperImpl::startElement( } m_xCompressedDocumentHandler->compressedStartElement(aName, aAttributes); - #endif - } BufferNode* pBufferNode = addNewElementMarkBuffers(); @@ -1149,13 +1141,9 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName ) (m_pCurrentBufferNode != m_pRootBufferNode) || (!m_xXMLDocument->isCurrentElementEmpty())) { - if (!m_bIsForwarding) - { - #ifndef _USECOMPRESSEDDOCUMENTHANDLER - m_xDocumentHandler->endElement(aName); - #else + if (!m_bIsForwarding) + { m_xCompressedDocumentHandler->compressedEndElement(aName); - #endif } /* @@ -1199,13 +1187,9 @@ void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars ) if ((m_pCurrentBlockingBufferNode != nullptr) || (m_pCurrentBufferNode != m_pRootBufferNode)) { - #ifndef _USECOMPRESSEDDOCUMENTHANDLER - m_xDocumentHandler->characters(aChars); - #else m_xCompressedDocumentHandler->compressedCharacters(aChars); - #endif - } } + } } void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const OUString& aWhitespaces ) @@ -1228,13 +1212,9 @@ void SAL_CALL SAXEventKeeperImpl::processingInstruction( if ((m_pCurrentBlockingBufferNode != nullptr) || (m_pCurrentBufferNode != m_pRootBufferNode)) { - #ifndef _USECOMPRESSEDDOCUMENTHANDLER - m_xDocumentHandler->processingInstruction(aTarget, aData); - #else m_xCompressedDocumentHandler->compressedProcessingInstruction(aTarget, aData); - #endif - } } + } } void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >&) |