From 406534cac729eb776a01ef1d80001056422b7fd5 Mon Sep 17 00:00:00 2001 From: Jörg Budischewski Date: Wed, 25 Oct 2000 07:13:18 +0000 Subject: introduced an implementation namespace to avoid this damn unix symbol problem --- sax/source/expatwrap/attrlistimpl.cxx | 6 ++++-- sax/source/expatwrap/attrlistimpl.hxx | 7 +++++-- sax/source/expatwrap/factory.hxx | 7 ++++--- sax/source/expatwrap/sax_expat.cxx | 9 ++++++--- sax/source/expatwrap/saxwriter.cxx | 7 ++++--- sax/source/expatwrap/xml2utf.cxx | 6 ++++-- 6 files changed, 27 insertions(+), 15 deletions(-) (limited to 'sax') diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx index 1d4a36c6f699..f471e2e0c05a 100644 --- a/sax/source/expatwrap/attrlistimpl.cxx +++ b/sax/source/expatwrap/attrlistimpl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: attrlistimpl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:43:12 $ + * last change: $Author: jbu $ $Date: 2000-10-25 08:13:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,6 +77,7 @@ using namespace ::com::sun::star::xml::sax; #include "attrlistimpl.hxx" +namespace sax_expatwrap { struct TagAttribute { TagAttribute() @@ -231,3 +232,4 @@ void AttributeListImpl::setAttributeList( const Reference< XAttributeList > &r assert( nMax == getLength() ); } +} diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index d618e5259719..91f0fd94e6f8 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: attrlistimpl.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:43:13 $ + * last change: $Author: jbu $ $Date: 2000-10-25 08:13:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,6 +60,8 @@ ************************************************************************/ #include +namespace sax_expatwrap +{ struct AttributeListImpl_impl; @@ -92,3 +94,4 @@ private: struct AttributeListImpl_impl *m_pImpl; }; +} diff --git a/sax/source/expatwrap/factory.hxx b/sax/source/expatwrap/factory.hxx index 57698321b574..6f669187bc59 100644 --- a/sax/source/expatwrap/factory.hxx +++ b/sax/source/expatwrap/factory.hxx @@ -2,9 +2,9 @@ * * $RCSfile: factory.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:43:13 $ + * last change: $Author: jbu $ $Date: 2000-10-25 08:13:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,10 +58,11 @@ * * ************************************************************************/ +namespace sax_expatwrap { Reference< XInterface > SAL_CALL SaxWriter_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw (Exception); OUString SaxWriter_getServiceName(); OUString SaxWriter_getImplementationName(); Sequence< OUString > SaxWriter_getSupportedServiceNames(void) throw(); - +} diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index 8c9a6f170c31..cbc4594de3f5 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sax_expat.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:43:13 $ + * last change: $Author: jbu $ $Date: 2000-10-25 08:13:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,6 +100,8 @@ using namespace ::com::sun::star::io; #include "attrlistimpl.hxx" #include "xml2utf.hxx" +namespace sax_expatwrap { + OUString XmlNChar2OUString( const XML_Char *p , int nLen ) { if( p ) { @@ -959,7 +961,8 @@ void SaxExpatParser_Impl::callbackEndCDATA( void *pvThis ) CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(pImpl,rExtendedDocumentHandler->endCDATA() ); } - +} +using namespace sax_expatwrap; extern "C" { diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index b4844d18c740..ac83bbb4f01a 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: saxwriter.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:43:13 $ + * last change: $Author: jbu $ $Date: 2000-10-25 08:13:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,7 @@ using namespace ::com::sun::star::io; * *****/ - +namespace sax_expatwrap { /***** * * Does special conversions (beside encoding) that is needed for xml. E.g. &<>"' plus some more are @@ -733,4 +733,5 @@ void SAXWriter::unknown(const OUString& sString) throw (SAXException, RuntimeExc writeSequence( seq ); } +} diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx index a87cefab493a..0e99bc3814fa 100644 --- a/sax/source/expatwrap/xml2utf.cxx +++ b/sax/source/expatwrap/xml2utf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xml2utf.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:43:13 $ + * last change: $Author: jbu $ $Date: 2000-10-25 08:13:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,6 +75,7 @@ using namespace ::com::sun::star::io; #include "xml2utf.hxx" +namespace sax_expatwrap { sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence &seq , sal_Int32 nMaxToRead ) throw ( IOException, NotConnectedException , BufferSizeExceededException , RuntimeException ) @@ -605,3 +606,4 @@ void Unicode2TextConverter::init( rtl_TextEncoding encoding ) }; +} -- cgit