sax: avoid pointless linking expwrap against sax

..only to share one class with fastsax in sax, where it's not used.
The link dependency is ugly, mostly for libmerged.
Use static library.
Another option would be to link fastsax against expwrap.

Change-Id: Ia85b01150959e2472d1ac04013b8b9a27232a070

5 files changed, 206 insertions, 174 deletions

diff --git a/sax/inc/fastserializer.hxx b/sax/inc/fastserializer.hxx
new file mode 100644
index 000000000000..765cafb90dd2
--- /dev/null
+++ b/sax/inc/fastserializer.hxx
@@ -0,0 +1,202 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef SAX_FASTSERIALIZER_HXX
+#define SAX_FASTSERIALIZER_HXX
+
+#include <com/sun/star/xml/sax/XFastSerializer.hpp>
+#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <rtl/byteseq.hxx>
+
+#include <stack>
+#include <map>
+
+#include <boost/shared_ptr.hpp>
+
+#include "sax/fshelper.hxx"
+
+#define SERIALIZER_IMPLEMENTATION_NAME  "com.sun.star.comp.extensions.xml.sax.FastSerializer"
+#define SERIALIZER_SERVICE_NAME     "com.sun.star.xml.sax.FastSerializer"
+
+namespace sax_fastparser {
+
+class SAX_DLLPUBLIC FastSaxSerializer : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::sax::XFastSerializer, ::com::sun::star::lang::XServiceInfo >
+{
+    typedef ::com::sun::star::uno::Sequence< ::sal_Int8 > Int8Sequence;
+    typedef ::com::sun::star::uno::Sequence< ::sal_Int32 > Int32Sequence;
+
+public:
+    explicit            FastSaxSerializer(  );
+    virtual             ~FastSaxSerializer();
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getOutputStream() {return mxOutputStream;}
+
+    // The implementation details
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString >   getSupportedServiceNames_Static(void);
+
+    // XFastSerializer
+    virtual void SAL_CALL startDocument(  ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL endDocument(  ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL startUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL endFastElement( ::sal_Int32 Element )
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL endUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name )
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL singleFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL singleUnknownElement( const ::rtl::OUString& Namespace, const ::rtl::OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs )
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL characters( const ::rtl::OUString& aChars )
+        throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream )
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFastTokenHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& xFastTokenHandler )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw ( ::com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw ( ::com::sun::star::uno::RuntimeException );
+
+    // C++ helpers
+    virtual void SAL_CALL writeId( ::sal_Int32 Element );
+
+    static ::rtl::OUString escapeXml( const ::rtl::OUString& s );
+
+public:
+    /** From now on, don't write directly to the stream, but to top of a stack.
+
+        This is to be able to change the order of the data being written.
+        If you need to write eg.
+          p, r, rPr, [something], /rPr, t, [text], /r, /p,
+        but get it in order
+          p, r, t, [text], /t, rPr, [something], /rPr, /r, /p,
+        simply do
+          p, r, mark(), t, [text], /t, mark(), rPr, [something], /rPr,
+          mergeTopMarks( true ), mergeTopMarks(), /r, /p
+        and you are done.
+     */
+    void mark( Int32Sequence aOrder = Int32Sequence() );
+
+    /** Merge 2 topmost marks.
+
+        There are 3 possibilities - prepend the top before the second top-most
+        mark, append it, or append it later; prepending brings the possibility
+        to switch parts of the output, appending later allows to write some
+        output in advance.
+
+        Writes the result to the output stream if the mark stack becomes empty
+        by the operation.
+
+        When the MERGE_MARKS_POSTPONE is specified, the merge happens just
+        before the next merge.
+
+        @see mark()
+     */
+    void mergeTopMarks( sax_fastparser::MergeMarksEnum eMergeType = sax_fastparser::MERGE_MARKS_APPEND );
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > mxOutputStream;
+    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > mxFastTokenHandler;
+
+    class ForMerge
+    {
+        Int8Sequence maData;
+        Int8Sequence maPostponed;
+
+    public:
+        ForMerge() : maData(), maPostponed() {}
+        virtual ~ForMerge() {}
+
+        virtual void setCurrentElement( ::sal_Int32 /*nToken*/ ) {}
+        virtual Int8Sequence& getData();
+#if DEBUG
+        virtual void print();
+#endif
+
+        virtual void prepend( const Int8Sequence &rWhat );
+        virtual void append( const Int8Sequence &rWhat );
+        void postpone( const Int8Sequence &rWhat );
+
+    protected:
+        void resetData( );
+        static void merge( Int8Sequence &rTop, const Int8Sequence &rMerge, bool bAppend );
+    };
+
+    class ForSort : public ForMerge
+    {
+        std::map< ::sal_Int32, Int8Sequence > maData;
+        sal_Int32 mnCurrentElement;
+
+        Int32Sequence maOrder;
+
+    public:
+        ForSort( Int32Sequence aOrder ) :
+            ForMerge(),
+            maData(),
+            mnCurrentElement( 0 ),
+            maOrder( aOrder ) {}
+
+        void setCurrentElement( ::sal_Int32 nToken );
+
+        virtual Int8Sequence& getData();
+
+#if DEBUG
+        virtual void print();
+#endif
+
+        virtual void prepend( const Int8Sequence &rWhat );
+        virtual void append( const Int8Sequence &rWhat );
+    private:
+        void sort();
+    };
+
+    ::std::stack< boost::shared_ptr< ForMerge > > maMarkStack;
+
+    void writeFastAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs );
+    void write( const ::rtl::OUString& s );
+
+protected:
+    rtl::ByteSequence maClosingBracket;
+    rtl::ByteSequence maSlashAndClosingBracket;
+    rtl::ByteSequence maColon;
+    rtl::ByteSequence maOpeningBracket;
+    rtl::ByteSequence maOpeningBracketAndSlash;
+    rtl::ByteSequence maQuote;
+    rtl::ByteSequence maEqualSignAndQuote;
+    rtl::ByteSequence maSpace;
+
+    /** Forward the call to the output stream, or write to the stack.
+
+        The latter in the case that we are inside a mark().
+     */
+    void writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+};
+
+} // namespace sax_fastparser
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/inc/sax/tools/attributemap.hxx b/sax/inc/sax/tools/attributemap.hxx
deleted file mode 100644
index 7797ef3aef45..000000000000
--- a/sax/inc/sax/tools/attributemap.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SAX_ATTRIBUTEMAP_HXX_
-#define _SAX_ATTRIBUTEMAP_HXX_
-
-#include <map>
-#include "sax/tools/tokenmap.hxx"
-
-namespace sax
-{
-    class SaxTokenMap;
-
-    typedef std::map< sal_uInt32, rtl::OString > AttributeMapBase;
-
-    /** a map for a set of xml attributes, identified with integer tokens.
-        Attribute values are stored in utf-8 encoding. */
-    class SAX_DLLPUBLIC AttributeMap : public AttributeMapBase
-    {
-    public:
-        AttributeMap( const SaxTokenMap& rTokenMap );
-        ~AttributeMap();
-
-        /** returns a unicode string, if the token does not exists the string is empty */
-        ::rtl::OUString getString( SaxToken nToken ) const;
-
-        /** returns true if the attribute with the token nToken is part of this map */
-        bool has( SaxToken nToken ) const;
-
-        /** converts the attribute with the token nToken to sal_Int32 or returns
-            nDefault if this attribute does not exists */
-        sal_Int32 getInt32( SaxToken nToken, sal_Int32 nDefault = 0 ) const;
-
-        /** converts the attribute with the token nToken to a token or returns
-            nDefault if this attribute does not exists */
-        sal_uInt32 getToken( SaxToken nToken, SaxToken nDefault ) const;
-
-    private:
-        const SaxTokenMap& mrTokenMap;
-    };
-
-}
-
-#endif // _SAX_ATTRIBUTEMAP_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/inc/sax/tools/saxobject.hxx b/sax/inc/sax/tools/saxobject.hxx
deleted file mode 100644
index f1fe1182be78..000000000000
--- a/sax/inc/sax/tools/saxobject.hxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SAX_OBJECT_HXX_
-#define _SAX_OBJECT_HXX_
-
-#include <sal/types.h>
-#include "sax/saxdllapi.h"
-
-namespace sax
-{
-
-    /** simple base class to allow refcounting with rtl::Reference or css::uno::Reference */
-    class SAX_DLLPUBLIC SaxObject
-    {
-    public:
-        SaxObject();
-        virtual ~SaxObject();
-        virtual void SAL_CALL acquire() throw ();
-        virtual void SAL_CALL release() throw ();
-    private:
-        sal_uInt32 mnRefCount;
-    };
-}
-
-#endif // _SAX_OBJECT_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/inc/sax/tools/tokenmap.hxx b/sax/inc/sax/tools/tokenmap.hxx
deleted file mode 100644
index 20cbaef41244..000000000000
--- a/sax/inc/sax/tools/tokenmap.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SAX_TOKENMAP_HXX_
-#define _SAX_TOKENMAP_HXX_
-
-#include <rtl/ref.hxx>
-#include <rtl/ustring.hxx>
-#include "sax/tools/saxobject.hxx"
-
-namespace sax
-{
-    /** type for a token identifier */
-    typedef sal_uInt32 SaxToken;
-
-    /** this class maps a set of ascii/utf-8 strings to token identifier */
-    class SAX_DLLPUBLIC SaxTokenMap : public SaxObject
-    {
-    public:
-        /** constant do indicate an unknown token */
-        const static SaxToken InvalidToken = (SaxToken)-1;
-
-        /** returns the token identifier for the given ascii string or SaxTokenMap::InvalidToken */
-        virtual SaxToken GetToken( const sal_Char* pChar, sal_uInt32 nLength  = 0 ) const = 0;
-
-        /** returns the token identifier for the given unicode string or SaxTokenMap::InvalidToken */
-        virtual SaxToken GetToken( const ::rtl::OUString& rToken ) const = 0;
-
-        /** returns the unicode string for the given token identifier */
-        virtual const ::rtl::OUString& GetToken( SaxToken nToken ) const = 0;
-
-        /** returns if the given unicode string equals the given token identifier */
-        bool IsToken( const ::rtl::OUString& rToken, SaxToken nToken ) const { return GetToken( rToken ) == nToken; }
-    };
-
-    /** reference type to a SaxTokenMap */
-    typedef rtl::Reference< SaxTokenMap > SaxTokenMapRef;
-}
-
-#endif // _SAX_TOKENMAP_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index d1d2e89210bc..9a6ee23e6ca3 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -17,17 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sax/saxdllapi.h>
+#include <sal/types.h>
 
-
-/*
-*
-* Text2UnicodeConverter
-*
-**/
 namespace sax_expatwrap {
 
-class SAX_DLLPUBLIC Text2UnicodeConverter
+class Text2UnicodeConverter
 {
 
 public:
@@ -53,7 +47,7 @@ private:
 * Unicode2TextConverter
 *
 **-----------------------------------------*/
-class SAX_DLLPUBLIC Unicode2TextConverter
+class Unicode2TextConverter
 {
 public:
     Unicode2TextConverter( rtl_TextEncoding encoding );
@@ -84,7 +78,7 @@ private:
 * XMLFile2UTFConverter
 *
 **-----------------------------------------*/
-class SAX_DLLPUBLIC XMLFile2UTFConverter
+class XMLFile2UTFConverter
 {
 public:
     XMLFile2UTFConverter( ):