diff options
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/source/expatwrap/saxwriter.cxx | 11 | ||||
| -rw-r--r-- | sax/source/tools/fastserializer.cxx | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 4b3b7a0a4efb..e54c9fcc1d22 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -20,16 +20,16 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <com/sun/star/xml/sax/SAXInvalidCharacterException.hpp> +#include <com/sun/star/xml/sax/XWriter.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <cppuhelper/factory.hxx> #include <cppuhelper/weak.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase2.hxx> #include <rtl/strbuf.hxx> #include <rtl/byteseq.hxx> @@ -863,10 +863,9 @@ static inline sal_Int32 getLastLineBreak( const Sequence<sal_Int8> & seq) throw class SAXWriter : - public WeakImplHelper3< - XActiveDataSource, - XExtendedDocumentHandler, - XServiceInfo > + public WeakImplHelper2< + XWriter, + XServiceInfo > { public: SAXWriter( ) : diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx index d12e7711acc1..bc2b12e92a9d 100644 --- a/sax/source/tools/fastserializer.cxx +++ b/sax/source/tools/fastserializer.cxx @@ -73,6 +73,7 @@ namespace sax_fastparser { void SAL_CALL FastSaxSerializer::startDocument( ) throw (SAXException, RuntimeException) { + assert(mxOutputStream.is()); // cannot do anything without that if (!mxOutputStream.is()) return; rtl::ByteSequence aXmlHeader((const sal_Int8*) "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n", 56); @@ -186,6 +187,7 @@ namespace sax_fastparser { throw (::com::sun::star::uno::RuntimeException) { mxOutputStream = xOutputStream; + assert(mxOutputStream.is()); // cannot do anything without that } void SAL_CALL FastSaxSerializer::setFastTokenHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& xFastTokenHandler ) |