Merge branch 'master' into feature/gnumake4

Conflicts:
	basebmp/prj/d.lst
	basebmp/test/basictest.cxx
	basebmp/test/makefile.mk
	basegfx/inc/basegfx/basegfxdllapi.h
	basegfx/inc/basegfx/tools/debugplotter.hxx
	basegfx/inc/basegfx/tuple/b2ituple.hxx
	basegfx/prj/d.lst
	basegfx/source/numeric/makefile.mk
	basegfx/source/polygon/makefile.mk
	basegfx/source/range/makefile.mk
	basegfx/source/raster/makefile.mk
	basegfx/source/tuple/makefile.mk
	basegfx/source/vector/makefile.mk
	basegfx/test/basegfx1d.cxx
	basegfx/test/makefile.mk
	basegfx/util/makefile.mk
	canvas/Library_canvasfactory.mk
	canvas/Module_canvas.mk
	canvas/prj/build.lst
	canvas/prj/d.lst
	canvas/source/cairo/cairo_canvashelper_texturefill.cxx
	canvas/source/cairo/makefile.mk
	canvas/source/tools/makefile.mk
	comphelper/qa/string/makefile.mk
	cppcanvas/Module_cppcanvas.mk
	cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
	cppcanvas/prj/build.lst
	cppcanvas/prj/d.lst
	cppcanvas/source/mtfrenderer/makefile.mk
	cppcanvas/util/makefile.mk
	i18npool/source/search/makefile.mk
	regexp/Library_regexp.mk
	regexp/prj/d.lst
	sax/CppunitTest_sax.mk
	sax/Library_sax.mk
	sax/prj/d.lst
	sax/qa/cppunit/test_converter.cxx
	sax/source/expatwrap/attrlistimpl.hxx
	sax/util/makefile.mk
	svtools/Library_svt.mk
	tools/Executable_sspretty.mk
	ucbhelper/prj/d.lst
	ucbhelper/source/provider/configureucb.cxx
	ucbhelper/source/provider/provconf.cxx
	ucbhelper/util/makefile.mk
	unotools/Library_utl.mk
	unotools/Module_unotools.mk
	unotools/Package_inc.mk
	unotools/prj/build.lst
	vcl/Library_desktop_detector.mk
	vcl/Library_vcl.mk
	vcl/Library_vclplug_gtk.mk
	vcl/aqua/source/gdi/salprn.cxx
	vcl/inc/aqua/saldata.hxx
	vcl/unx/generic/gdi/salgdi3.cxx

1 files changed, 137 insertions, 12 deletions

diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index af89761a2c86..68e2f5ebfac5 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,12 +30,19 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/byteseq.hxx>
 
+#include <comphelper/sequenceasvector.hxx>
+
 #include <com/sun/star/xml/Attribute.hpp>
 #include <com/sun/star/xml/FastAttribute.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 
 #include <string.h>
 
+#if DEBUG
+#include <iostream>
+#endif
+
+using ::comphelper::SequenceAsVector;
 using ::rtl::OString;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
@@ -82,7 +90,7 @@ namespace sax_fastparser {
     OUString FastSaxSerializer::escapeXml( const OUString& s )
     {
         ::rtl::OUStringBuffer sBuf( s.getLength() );
-        const sal_Unicode* pStr = s;
+        const sal_Unicode* pStr = s.getStr();
         sal_Int32 nLen = s.getLength();
         for( sal_Int32 i = 0; i < nLen; ++i)
         {
@@ -130,6 +138,9 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
+        if ( !maMarkStack.empty() )
+            maMarkStack.top()->setCurrentElement( Element );
+
         writeBytes(toUnoSequence(aOpeningBracket));
 
         writeId(Element);
@@ -197,6 +208,9 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
+        if ( !maMarkStack.empty() )
+            maMarkStack.top()->setCurrentElement( Element );
+
         writeBytes(toUnoSequence(aOpeningBracket));
 
         writeId(Element);
@@ -282,7 +296,7 @@ namespace sax_fastparser {
     // XServiceInfo
     OUString FastSaxSerializer::getImplementationName() throw (RuntimeException)
     {
-        return OUString::createFromAscii( SERIALIZER_IMPLEMENTATION_NAME );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_IMPLEMENTATION_NAME ));
     }
 
     // XServiceInfo
@@ -302,13 +316,13 @@ namespace sax_fastparser {
     Sequence< OUString > FastSaxSerializer::getSupportedServiceNames(void) throw (RuntimeException)
     {
         Sequence<OUString> seq(1);
-        seq.getArray()[0] = OUString::createFromAscii( SERIALIZER_SERVICE_NAME );
+        seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_SERVICE_NAME ));
         return seq;
     }
 
     OUString FastSaxSerializer::getImplementationName_Static()
     {
-        return OUString::createFromAscii( SERIALIZER_IMPLEMENTATION_NAME );
+        return OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_IMPLEMENTATION_NAME ));
     }
 
     Sequence< OUString > FastSaxSerializer::getSupportedServiceNames_Static(void)
@@ -318,10 +332,36 @@ namespace sax_fastparser {
         return aRet;
     }
 
-    void FastSaxSerializer::mark()
+    void FastSaxSerializer::mark( Int32Sequence aOrder )
     {
-        maMarkStack.push( ForMerge() );
+        if ( aOrder.hasElements() )
+        {
+            boost::shared_ptr< ForMerge > pSort( new ForSort( aOrder ) );
+            maMarkStack.push( pSort );
+        }
+        else
+        {
+            boost::shared_ptr< ForMerge > pMerge( new ForMerge( ) );
+            maMarkStack.push( pMerge );
+        }
+    }
+
+#if DEBUG
+    void FastSaxSerializer::printMarkStack( )
+    {
+        ::std::stack< boost::shared_ptr< ForMerge > > aCopy( maMarkStack );
+        int nSize = aCopy.size();
+        int i = 0;
+        while ( !aCopy.empty() )
+        {
+            std::cerr << nSize - i << "\n";
+            aCopy.top( )->print( );
+            std::cerr << "\n";
+            aCopy.pop( );
+            i++;
+        }
     }
+#endif
 
     void FastSaxSerializer::mergeTopMarks( sax_fastparser::MergeMarksEnum eMergeType )
     {
@@ -330,19 +370,19 @@ namespace sax_fastparser {
 
         if ( maMarkStack.size() == 1 )
         {
-            mxOutputStream->writeBytes( maMarkStack.top().getData() );
+            mxOutputStream->writeBytes( maMarkStack.top()->getData() );
             maMarkStack.pop();
             return;
         }
 
-        const Int8Sequence aMerge( maMarkStack.top().getData() );
+        const Int8Sequence aMerge( maMarkStack.top()->getData() );
         maMarkStack.pop();
 
         switch ( eMergeType )
         {
-            case MERGE_MARKS_APPEND:   maMarkStack.top().append( aMerge );   break;
-            case MERGE_MARKS_PREPEND:  maMarkStack.top().prepend( aMerge );  break;
-            case MERGE_MARKS_POSTPONE: maMarkStack.top().postpone( aMerge ); break;
+            case MERGE_MARKS_APPEND:   maMarkStack.top()->append( aMerge );   break;
+            case MERGE_MARKS_PREPEND:  maMarkStack.top()->prepend( aMerge );  break;
+            case MERGE_MARKS_POSTPONE: maMarkStack.top()->postpone( aMerge ); break;
         }
     }
 
@@ -351,7 +391,7 @@ namespace sax_fastparser {
         if ( maMarkStack.empty() )
             mxOutputStream->writeBytes( aData );
         else
-            maMarkStack.top().append( aData );
+            maMarkStack.top()->append( aData );
     }
 
     FastSaxSerializer::Int8Sequence& FastSaxSerializer::ForMerge::getData()
@@ -362,6 +402,25 @@ namespace sax_fastparser {
         return maData;
     }
 
+#if DEBUG
+    void FastSaxSerializer::ForMerge::print( )
+    {
+        std::cerr << "Data: ";
+        for ( sal_Int32 i=0, len=maData.getLength(); i < len; i++ )
+        {
+            std::cerr << maData[i];
+        }
+
+        std::cerr << "\nPostponed: ";
+        for ( sal_Int32 i=0, len=maPostponed.getLength(); i < len; i++ )
+        {
+            std::cerr << maPostponed[i];
+        }
+
+        std::cerr << "\n";
+    }
+#endif
+
     void FastSaxSerializer::ForMerge::prepend( const Int8Sequence &rWhat )
     {
         merge( maData, rWhat, false );
@@ -399,5 +458,71 @@ namespace sax_fastparser {
         }
     }
 
+    void FastSaxSerializer::ForMerge::resetData( )
+    {
+        maData = Int8Sequence();
+    }
+
+    void FastSaxSerializer::ForSort::setCurrentElement( sal_Int32 nElement )
+    {
+        SequenceAsVector< sal_Int32 > aOrder( maOrder );
+        if( std::find( aOrder.begin(), aOrder.end(), nElement ) != aOrder.end() )
+        {
+            mnCurrentElement = nElement;
+            if ( maData.find( nElement ) == maData.end() )
+                maData[ nElement ] = Int8Sequence();
+        }
+    }
+
+    void FastSaxSerializer::ForSort::prepend( const Int8Sequence &rWhat )
+    {
+        append( rWhat );
+    }
+
+    void FastSaxSerializer::ForSort::append( const Int8Sequence &rWhat )
+    {
+        merge( maData[mnCurrentElement], rWhat, true );
+    }
+
+    void FastSaxSerializer::ForSort::sort()
+    {
+        // Clear the ForMerge data to avoid duplicate items
+        resetData();
+
+        // Sort it all
+        std::map< sal_Int32, Int8Sequence >::iterator iter;
+        for ( sal_Int32 i=0, len=maOrder.getLength(); i < len; i++ )
+        {
+            iter = maData.find( maOrder[i] );
+            if ( iter != maData.end() )
+                ForMerge::append( iter->second );
+        }
+    }
+
+    FastSaxSerializer::Int8Sequence& FastSaxSerializer::ForSort::getData()
+    {
+        sort( );
+        return ForMerge::getData();
+    }
+
+#if DEBUG
+    void FastSaxSerializer::ForSort::print( )
+    {
+        std::map< sal_Int32, Int8Sequence >::iterator iter = maData.begin();
+        while ( iter != maData.end( ) )
+        {
+            std::cerr << "pair: " << iter->first;
+            for ( sal_Int32 i=0, len=iter->second.getLength(); i < len; ++i )
+                std::cerr << iter->second[i];
+            std::cerr << "\n";
+            ++iter;
+        }
+
+        sort( );
+        ForMerge::print();
+    }
+#endif
+
 } // namespace sax_fastparser
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */