Use valid UNOIDL identifiers in XCompressedDocumentHandler

...which is new in LO 4.3 and still unpublished.

Change-Id: I2d6b553c27906d7855c62f33fdf0060b58d3ec62

3 files changed, 21 insertions, 21 deletions

diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 1c7b5ca5a9b9..7617589b5565 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -1218,7 +1218,7 @@ void SAL_CALL SAXEventKeeperImpl::startElement(
             aAttributes[i].sValue =xAttribs->getValueByIndex((short)i);
         }
 
-        m_xCompressedDocumentHandler->_startElement(aName, aAttributes);
+        m_xCompressedDocumentHandler->compressedStartElement(aName, aAttributes);
     #endif
 
     }
@@ -1255,7 +1255,7 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName )
         #ifndef _USECOMPRESSEDDOCUMENTHANDLER
             m_xDocumentHandler->endElement(aName);
         #else
-            m_xCompressedDocumentHandler->_endElement(aName);
+            m_xCompressedDocumentHandler->compressedEndElement(aName);
         #endif
         }
 
@@ -1303,7 +1303,7 @@ void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars )
         #ifndef _USECOMPRESSEDDOCUMENTHANDLER
                 m_xDocumentHandler->characters(aChars);
         #else
-            m_xCompressedDocumentHandler->_characters(aChars);
+            m_xCompressedDocumentHandler->compressedCharacters(aChars);
         #endif
             }
         }
@@ -1332,7 +1332,7 @@ void SAL_CALL SAXEventKeeperImpl::processingInstruction(
         #ifndef _USECOMPRESSEDDOCUMENTHANDLER
             m_xDocumentHandler->processingInstruction(aTarget, aData);
         #else
-            m_xCompressedDocumentHandler->_processingInstruction(aTarget, aData);
+            m_xCompressedDocumentHandler->compressedProcessingInstruction(aTarget, aData);
         #endif
             }
         }
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 02f9d9b0883b..9b5d78357658 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -971,7 +971,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName
         aAttributes[i].sValue =xAttribs->getValueByIndex((short)i);
     }
 
-    _startElement(aName, aAttributes);
+    compressedStartElement(aName, aAttributes);
 }
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const OUString& aName )
@@ -1006,17 +1006,17 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setDocumentLocator( const cssu::Ref
 }
 
 /* XCompressedDocumentHandler */
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startDocument(  )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartDocument(  )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endDocument(  )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedEndDocument(  )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     saxHelper.startElement(aName, aAttributes);
@@ -1025,31 +1025,31 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const OUString& aNam
     buildIDAttr( m_pCurrentElement );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endElement( const OUString& aName )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedEndElement( const OUString& aName )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     endElement( aName );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_characters( const OUString& aChars )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedCharacters( const OUString& aChars )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     characters( aChars );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_ignorableWhitespace( const OUString& aWhitespaces )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedIgnorableWhitespace( const OUString& aWhitespaces )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     ignorableWhitespace( aWhitespaces );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_processingInstruction( const OUString& aTarget, const OUString& aData )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedProcessingInstruction( const OUString& aTarget, const OUString& aData )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
     processingInstruction( aTarget, aData );
 }
 
-void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_setDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ )
+void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedSetDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ )
     throw (cssxs::SAXException, cssu::RuntimeException, std::exception)
 {
 }
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index 642488f1cb9b..c7252d9c3401 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -212,31 +212,31 @@ public:
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /* com::sun::star::xml::csax::XCompressedDocumentHandler */
-    virtual void SAL_CALL _startDocument(  )
+    virtual void SAL_CALL compressedStartDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL _endDocument(  )
+    virtual void SAL_CALL compressedEndDocument(  )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL _startElement(
+    virtual void SAL_CALL compressedStartElement(
         const OUString& aName,
         const com::sun::star::uno::Sequence<
             com::sun::star::xml::csax::XMLAttribute >& aAttributes )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL _endElement( const OUString& aName )
+    virtual void SAL_CALL compressedEndElement( const OUString& aName )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL _characters( const OUString& aChars )
+    virtual void SAL_CALL compressedCharacters( const OUString& aChars )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL _ignorableWhitespace( const OUString& aWhitespaces )
+    virtual void SAL_CALL compressedIgnorableWhitespace( const OUString& aWhitespaces )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL _processingInstruction( const OUString& aTarget, const OUString& aData )
+    virtual void SAL_CALL compressedProcessingInstruction( const OUString& aTarget, const OUString& aData )
         throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-    virtual void SAL_CALL _setDocumentLocator(
+    virtual void SAL_CALL compressedSetDocumentLocator(
         sal_Int32 columnNumber,
         sal_Int32 lineNumber,
         const OUString& publicId,