mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use valid UNOIDL identifiers in XCompressedDocumentHandler

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

Change-Id: I2d6b553c27906d7855c62f33fdf0060b58d3ec62
This commit is contained in:
Stephan Bergmann 2014-04-11 08:34:05 +02:00
parent f699e7b9b2
commit fb1b0c1f7b
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl
View File

@ -42,28 +42,28 @@ module com { module sun { module star { module xml { module csax {
*/
interface XCompressedDocumentHandler: com::sun::star::uno::XInterface
{
void _startDocument()
void compressedStartDocument()
raises( com::sun::star::xml::sax::SAXException );
void _endDocument()
void compressedEndDocument()
raises( com::sun::star::xml::sax::SAXException );
void _startElement( [in] string aName, [in] sequence< XMLAttribute > aAttributes)
void compressedStartElement( [in] string aName, [in] sequence< XMLAttribute > aAttributes)
raises( com::sun::star::xml::sax::SAXException );
void _endElement( [in] string aName )
void compressedEndElement( [in] string aName )
raises( com::sun::star::xml::sax::SAXException );
void _characters( [in] string aChars )
void compressedCharacters( [in] string aChars )
raises( com::sun::star::xml::sax::SAXException );
void _ignorableWhitespace( [in] string aWhitespaces )
void compressedIgnorableWhitespace( [in] string aWhitespaces )
raises( com::sun::star::xml::sax::SAXException );
void _processingInstruction( [in] string aTarget, [in] string aData )
void compressedProcessingInstruction( [in] string aTarget, [in] string aData )
raises( com::sun::star::xml::sax::SAXException );
void _setDocumentLocator( [in] long columnNumber, [in] long lineNumber, [in] string publicId, [in] string systemId)
void compressedSetDocumentLocator( [in] long columnNumber, [in] long lineNumber, [in] string publicId, [in] string systemId)
raises( com::sun::star::xml::sax::SAXException );
};

8
xmlsecurity/source/framework/saxeventkeeperimpl.cxx
View File

@ -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
}
}

18
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
View File

@ -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)
{
}

16
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
View File

@ -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,